@@ -4,6 +4,6 @@ require "active_support/inflector" require "active_support/core_ext/hash" -["base", "contact"].each do |lib| +["model", "config", "contact", "company"].each do |lib| require File.join(File.dirname(__FILE__), "solve360", lib) end \ No newline at end of file lib/solve360.rb @@ -1,10 +1,9 @@ module Solve360 - class Contact < Solve360::Base + class Contact + include Solve360::Model + fields do - {"Archived" => "archive", - "Assigned To" => "assignedto", - "Background" => "background", - "Business Address" => "businessaddress", + {"Business Address" => "businessaddress", "Business Direct" => "businessphonedirect", "Business Email" => "businessemail", "Business Fax" => "businessfax", lib/solve360/contact.rb @@ -1 +1 @@ -Solve360::Base.configure YAML.load(File.read(File.join(File.dirname(__FILE__), '..', 'spec', 'api_settings.yml'))) \ No newline at end of file +Solve360::Config.configure YAML.load(File.read(File.join(File.dirname(__FILE__), '..', 'spec', 'api_settings.yml'))) \ No newline at end of file script/console-startup.rb @@ -1,13 +1,13 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper") -class Person < Solve360::Base +class Person + include Solve360::Model + fields do { "Job Title" => "job_title" } end end - - describe "A Solve360 model" do it "should determine model name" do Person.resource_name.should == "people" spec/solve360/base_spec.rb @@ -2,7 +2,7 @@ require 'rubygems' require File.join(File.dirname(__FILE__), '..', 'lib', 'solve360') -Solve360::Base.configure YAML::load(File.read(File.join(File.dirname(__FILE__), 'api_settings.yml'))) +Solve360::Config.configure YAML::load(File.read(File.join(File.dirname(__FILE__), 'api_settings.yml'))) def file_fixture(filename) open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename.to_s}")).read spec/spec_helper.rb lib/solve360/base.rb 923ef65a7fc2b9866dbf4988d241b81ab0a869c8 Stephen Bartholomew steve@curve21.com http://github.com/curve21/solve360/commit/9fee1e76c93c32c4bcf2db66c3feab7416a396a9 9fee1e76c93c32c4bcf2db66c3feab7416a396a9 2009-10-08T07:43:25-07:00 2009-10-08T07:43:25-07:00 Move to modules cd1a9d992ef45cb43a9063066896220a11d77198 Stephen Bartholomew steve@curve21.com