jaysus 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/jaysus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jaysus}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2011-01-25}
+  s.date = %q{2011-01-26}
   s.description = %q{Persist remote JSON APIs locally and vice versa}
   s.email = %q{paul@rslw.com}
   s.extra_rdoc_files = [
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/paulca/jaysus}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{A Ruby library for managing local / remote JSON store}
   s.test_files = [
     "spec/local_spec.rb",
@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/jaysus/base.rb

@@ -128,7 +128,7 @@ module Jaysus
     
     def attributes
       out = {}
-      self.class.model_base.attributes.each do |attribute|
+      (self.class.model_base.attributes + self.class.attributes).each do |attribute|
         out[attribute.to_s] = send(attribute)
       end
       out
@@ -173,7 +173,7 @@ module Jaysus
     def to_json
       {}.tap do |outer_hash|
         outer_hash[self.class.store_file_dir_name.singularize] = {}.tap do |inner_hash|
-          self.class.model_base.attributes.each do |attribute|
+          (self.class.model_base.attributes + self.class.attributes).each do |attribute|
             if self.send(attribute).present?
               inner_hash[attribute] = self.send(attribute)
             end

data/lib/jaysus/local.rb

@@ -30,7 +30,6 @@ module Jaysus
     
     module ClassMethods
       def all
-        # debugger if self.model_name == 'Kalipso::Site'
         records = []
         Dir[store_file_dir.join('*')].each do |id|
           records << find(id)

data/lib/jaysus/remote.rb

@@ -24,16 +24,18 @@ module Jaysus
       super do
         response = if pk = self.send(self.class.model_base.primary_key)
           RestClient.put("#{self.class.model_url}/#{pk}", self.to_json, {
-            'Content-Type' => 'application/json'
+            'Content-Type' => 'application/json',
+            'Accept' => 'application/json'
           })
         else
           RestClient.post(self.class.model_url, self.to_json, {
-            'Content-Type' => 'application/json'
+            'Content-Type' => 'application/json',
+            'Accept' => 'application/json'
           })
         end
         decoded_response = ActiveSupport::JSON.decode(
           response
-        )[self.class.singular_name]
+        )[self.class.singular_object_name]
         self.set_attributes(decoded_response)
         self
       end

data/spec/local_spec.rb

@@ -31,7 +31,7 @@ describe Jaysus::Local do
       end
       context "within a module" do
         subject { Kalipso::Site::Local.all }
-        its(:length) { should == 1}
+        its(:length) { should == 1 }
         its(:first) { should be_a_kind_of(Kalipso::Site::Local) }
       end
     end
@@ -82,8 +82,12 @@ describe Jaysus::Local do
   end
   
   describe "#update_attributes" do
-    subject { site.update_attributes(:title => "Newer Site")}
-    its(:title) { should == "Newer Site" }
+    before do
+      site.save
+      site.update_attributes(:title => "Newer Site", :path => "nice")
+    end
+    subject { File.read("#{Site::Local.store_file_dir}/#{site.id}")}
+    it { should match(/nice/) }
   end
   
   describe "#destroy" do

data/spec/remote_spec.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Jaysus::Remote do
   
   let(:site) { Site::Remote.new({ :title => "New Site" }) }
+  let(:module_site) { Kalipso::Site::Remote.new({ :title => "New Site" }) }
   
   describe ".all" do
     before do
@@ -47,15 +48,25 @@ describe Jaysus::Remote do
         'http://testapi/sites',
         site.to_json,
         {
-          'Content-Type' => 'application/json'
+          'Content-Type' => 'application/json',
+          'Accept' => 'application/json'
         }
       ).and_return(File.read('spec/fixtures/new_site.json'))
-      site.save
     end
     
-    subject { site }
-    its(:id) { should == 2 }
-    its(:title) { should == "New Site" }
+    context "normal" do
+      before { site.save }
+      subject { site }
+      its(:id) { should == 2 }
+      its(:title) { should == "New Site" }
+    end
+    
+    context "within a module" do
+      before { module_site.save }
+      subject { module_site }
+      its(:id) { should == 2 }
+      its(:title) { should == "New Site" }
+    end
   end
   
   describe "#update_attributes" do
@@ -63,7 +74,7 @@ describe Jaysus::Remote do
       RestClient.should_receive(:get).with(
         'http://testapi/sites/42',
         {
-          'Accept' => 'application/json'
+          'Accept' => 'application/json',
         }
       ).and_return(File.read('spec/fixtures/find_site.json'))
       
@@ -71,7 +82,8 @@ describe Jaysus::Remote do
         'http://testapi/sites/42',
         "{\"site\":{\"title\":\"Monster!\",\"id\":42,\"user_id\":42}}",
         {
-          'Content-Type' => 'application/json'
+          'Content-Type' => 'application/json',
+          'Accept' => 'application/json'
         }
       ).and_return(File.read('spec/fixtures/update_site.json'))
     end

data/spec/support/site.rb

@@ -8,6 +8,7 @@ module Site
   
   class Local < Base
     include Jaysus::Local
+    attribute :path
   end
   
   class Remote < Base

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jaysus
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Paul Campbell
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 +00:00
+date: 2011-01-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
   name: activemodel
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,9 +35,9 @@ dependencies:
         version: 3.0.0
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
   name: activesupport
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,9 +51,9 @@ dependencies:
         version: 3.0.0
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
   name: rest-client
+  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,9 +67,9 @@ dependencies:
         version: 1.6.1
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   name: bundler
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,9 +83,9 @@ dependencies:
         version: 1.0.0
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   name: fakeweb
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,9 +99,9 @@ dependencies:
         version: 1.3.0
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   name: jeweler
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,9 +115,9 @@ dependencies:
         version: 1.5.2
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   name: rcov
+  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,9 +129,9 @@ dependencies:
         version: "0"
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   name: rspec
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,9 +145,9 @@ dependencies:
         version: 2.0.0
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   name: ruby-debug
+  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A Ruby library for managing local / remote JSON store