jaysus 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/jaysus.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jaysus}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "spec/support/debugger.rb",
     "spec/support/fakeweb.rb",
     "spec/support/jaysus.rb",
+    "spec/support/kalipso_site.rb",
     "spec/support/site.rb"
   ]
   s.homepage = %q{http://github.com/paulca/jaysus}
@@ -56,6 +57,7 @@ Gem::Specification.new do |s|
     "spec/support/debugger.rb",
     "spec/support/fakeweb.rb",
     "spec/support/jaysus.rb",
+    "spec/support/kalipso_site.rb",
     "spec/support/site.rb"
   ]
 

data/lib/jaysus/base.rb

@@ -55,7 +55,7 @@ module Jaysus
     def self.decode(id, &block)
       ActiveSupport::JSON.decode(
         yield
-      )[self.model_name.singular]
+      )[self.store_file_dir_name.singularize]
     end
     
     def self.model_base
@@ -71,9 +71,8 @@ module Jaysus
     end
     
     def self.model_name
-      parts = super.split('::')
-      name_part = parts[parts.length-2]
-      ActiveModel::Name.new(name_part.constantize)
+      parts = super.reverse.split('::',2).reverse.map { |p| p.reverse }
+      ActiveModel::Name.new(parts.first.constantize)
     end
     
     def self.plural_name
@@ -95,8 +94,20 @@ module Jaysus
       dir
     end
     
+    def self.object_name
+      self.model_name.split('::').last
+    end
+    
+    def self.plural_object_name
+      self.object_name.underscore.pluralize
+    end
+    
+    def self.singular_object_name
+      self.object_name.underscore.singularize
+    end
+    
     def self.store_file_dir_name
-      self.model_name.plural
+      self.plural_object_name
     end
     
     def self.method_missing(method, *args)

data/lib/jaysus/local.rb

@@ -1,6 +1,5 @@
 module Jaysus
   module Local
-    
     def self.store_dir
       @store_dir ||= Pathname.new('.')
     end
@@ -31,6 +30,7 @@ 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

@@ -1,5 +1,5 @@
 module Jaysus
-  module Remote
+  module Remote    
     def self.base_url
       @base_url ||= ''
     end
@@ -47,7 +47,7 @@ module Jaysus
     
     module ClassMethods
       def model_url
-        "#{Jaysus::Remote.base_url}/#{self.plural_name}"
+        "#{Jaysus::Remote.base_url}/#{self.plural_object_name}"
       end
       
       def all
@@ -55,7 +55,7 @@ module Jaysus
         ActiveSupport::JSON.decode(RestClient.get(model_url,{
           'Accept' => 'application/json'
         })).each do |raw_record|
-          records << new(raw_record[self.singular_name])
+          records << new(raw_record[self.singular_object_name])
         end
         records
       end

data/spec/local_spec.rb

@@ -12,10 +12,28 @@ describe Jaysus::Local do
   describe "finder methods" do
     before(:each) { FileUtils.cp('spec/fixtures/1', Site::Local.store_file_dir) }
     
+    describe ".store_file_dir_name" do
+      context "normal" do
+        subject { Site::Local }
+        its(:store_file_dir_name) { should == 'sites' }
+      end
+      context "within a module" do
+        subject { Kalipso::Site::Local }
+        its(:store_file_dir_name) { should == 'sites' }
+      end
+    end
+    
     describe ".all" do
-      subject { Site::Local.all }
-      its(:length) { should == 1}
-      its(:first) { should be_a_kind_of(Site::Local) }
+      context "normal" do
+        subject { Site::Local.all }
+        its(:length) { should == 1}
+        its(:first) { should be_a_kind_of(Site::Local) }
+      end
+      context "within a module" do
+        subject { Kalipso::Site::Local.all }
+        its(:length) { should == 1}
+        its(:first) { should be_a_kind_of(Kalipso::Site::Local) }
+      end
     end
     
     describe ".find" do

data/spec/remote_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Jaysus::Remote do
+  
   let(:site) { Site::Remote.new({ :title => "New Site" }) }
   
   describe ".all" do
@@ -12,9 +13,17 @@ describe Jaysus::Remote do
         }
       ).and_return(File.read('spec/fixtures/all.json'))
     end
-    subject { Site::Remote.all.first }
-    it { should_not be_nil }
-    its(:title) { should == "I'm from all" }
+    context "normal" do
+      subject { Site::Remote.all.first }
+      it { should_not be_nil }
+      its(:title) { should == "I'm from all" }
+    end
+    
+    context "within a module" do
+      subject { Kalipso::Site::Remote.all.first }
+      it { should_not be_nil }
+      its(:title) { should == "I'm from all" }
+    end
   end
   
   describe ".find" do

data/spec/support/kalipso_site.rb

@@ -0,0 +1,18 @@
+module Kalipso
+  module Site
+    class Base < Jaysus::Base
+      primary_key :id
+      attribute :id
+      attribute :title
+      attribute :user_id
+    end
+  
+    class Local < Base
+      include Jaysus::Local
+    end
+  
+    class Remote < Base
+      include Jaysus::Remote
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jaysus
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Paul Campbell
@@ -193,6 +193,7 @@ files:
 - spec/support/debugger.rb
 - spec/support/fakeweb.rb
 - spec/support/jaysus.rb
+- spec/support/kalipso_site.rb
 - spec/support/site.rb
 has_rdoc: true
 homepage: http://github.com/paulca/jaysus
@@ -235,4 +236,5 @@ test_files:
 - spec/support/debugger.rb
 - spec/support/fakeweb.rb
 - spec/support/jaysus.rb
+- spec/support/kalipso_site.rb
 - spec/support/site.rb