couchmodel 0.1.0 → 0.1.1

data/README.rdoc

@@ -6,16 +6,17 @@ implementation to integrate into an Rails 3 application.
 
 The current version is under development and open for everyone to find bugs and post them into the issue tracker.
 
-The code has been tested Ruby 1.9.1, CouchDB 0.10.0 and Rails 3.0.0.beta.
+The code has been tested Ruby 1.8.7 and 1.9.1, CouchDB 0.10.0 and Rails 3.0.0.beta3.
 
 == Dependencies
 
-If CouchModel is used without Rails, the ruby standard library (tested with 1.9.1) if the only requirement.
+Basically, the ruby standard library (1.9.1) if the only requirement. If you still using Ruby 1.8, the json gem is
+required.
 
 If the activemodel gem is installed, CouchModel automatically provides an interface to Rails 3.
 
-To run the test suite, <tt>rspec</tt> (tested with 1.2.9) is required. A CouchDB instance is just required for the
-integration tests (task <tt>spec:integration</tt>).
+To run the test suite, rspec (tested with 1.2.9) is required. A CouchDB instance is only required for the integration
+tests (task <tt>spec:integration</tt>).
 
 == Installation
 

data/Rakefile

@@ -9,8 +9,8 @@ task :default => :spec
 
 specification = Gem::Specification.new do |specification|
   specification.name              = "couchmodel"
-  specification.version           = "0.1.0"
-  specification.date              = "2010-03-31"
+  specification.version           = "0.1.1"
+  specification.date              = "2010-05-05"
 
   specification.authors           = [ "Philipp Bruell" ]
   specification.email             = "b.phifty@gmail.com"
@@ -26,6 +26,8 @@ specification = Gem::Specification.new do |specification|
   specification.require_path      = "lib"
 
   specification.test_files        = Dir["spec/**/*_spec.rb"]
+
+  specification.add_development_dependency "rspec"
 end
 
 Rake::GemPackageTask.new(specification) do |package|

data/lib/core_extension/string.rb

@@ -3,7 +3,13 @@ class String # :nodoc:
 
   # This method converts a CamelCaseString into an underscore_string.
   def underscore
-    self.gsub(/([a-z][A-Z])/){ |match| "#{match[0]}_#{match[1]}" }.downcase
+    word = self.to_s.dup
+    word.gsub!(/::/, '/')
+    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
   end
 
   # This method converts an underscore_string into a CamelCaseString.

data/lib/couch_model/active_model.rb

@@ -37,10 +37,14 @@ module CouchModel
 
     alias new_record? new?
 
+    def persisted?
+      !new?
+    end
+
     alias destroyed? new?
 
     def to_param
-      id
+      persisted? ? id : nil
     end
 
     alias save_without_active_model save

data/lib/couch_model/design.rb

@@ -29,7 +29,7 @@ module CouchModel
     end
 
     def filename
-      @filename ||= File.join(CouchModel::Configuration.design_directory, "#{model_class.to_s.underscore}.design")
+      @filename ||= File.join(CouchModel::Configuration.design_directory, "#{@model_class.to_s.underscore}.design")
     end
 
     def load_file

data/spec/integration/associations_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "models"))
+
+describe "integration" do
+
+  use_real_transport!
+
+  before :each do
+    create_users_and_memberships
+  end
+
+  describe "belongs_to" do
+
+    it "should return the related model" do
+      @membership_one.user.should == @user_one
+      @membership_two.user.should == @user_two
+    end
+
+  end
+
+  describe "has_many" do
+
+    it "should include the related model" do
+      @user_one.memberships.should include(@membership_one)
+      @user_two.memberships.should include(@membership_two)
+    end
+
+    it "should not include the not-related model" do
+      @user_one.memberships.should_not include(@membership_two)
+      @user_two.memberships.should_not include(@membership_one)
+    end
+
+    it "should use the selector" do
+      @user_one.memberships("yesterday").should include(@membership_one)
+      @user_one.memberships("today").should_not include(@membership_one)
+    end
+
+  end
+
+end

data/spec/integration/models.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "couch_model"))
+
+CouchModel::Configuration.design_directory = File.join File.dirname(__FILE__), "design"
+
+DATABASE = {
+  :url                => "http://localhost:5984/test",
+  :create_if_missing  => true,
+  :delete_if_exists   => true,
+  :push_design        => true
+}.freeze unless defined?(DATABASE)
+
+class User < CouchModel::Base
+
+  setup_database DATABASE
+
+  key_accessor :username
+  key_accessor :email, :default => "no email"
+
+  has_many :memberships,
+           :class_name  => "Membership",
+           :view_name   => :by_user_id_and_created_at,
+           :query       => lambda { |created_at| { :startkey => [ self.id, (created_at || nil) ], :endkey => [ self.id, (created_at || { }) ] } }
+
+end
+
+class Membership < CouchModel::Base
+
+  setup_database DATABASE
+
+  key_accessor :created_at
+
+  belongs_to :user, :class_name => "User"
+
+end
+
+def create_users_and_memberships
+  @user_one = User.create :username => "user one"
+  @user_two = User.create :username => "user two"
+  @membership_one = Membership.create :created_at => "yesterday", :user => @user_one
+  @membership_two = Membership.create :created_at => "yesterday", :user => @user_two
+end

data/spec/integration/new_model_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "models"))
+
+describe "integration" do
+
+  use_real_transport!
+
+  before :each do
+    @user = User.new :username => "user"
+  end
+
+  describe "setup" do
+
+    it "should have been created the database" do
+      User.database.exists?.should be_true
+    end
+
+    it "should have been created the design" do
+      User.design.exists?.should be_true
+    end
+
+    it "should setup unique databases" do
+      User.database.should === Membership.database
+    end
+
+    it "should setup designs for each model" do
+      User.design.should_not == Membership.design
+    end
+
+  end
+
+  describe "save" do
+
+    it "should create the model" do
+      @user.save
+      @user.should_not be_new
+    end
+
+    it "should return true" do
+      @user.save.should be_true
+    end
+
+  end
+
+end

data/spec/integration/saved_model_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "models"))
+
+describe "integration" do
+
+  use_real_transport!
+
+  before :each do
+    create_users_and_memberships
+  end
+
+  describe "save" do
+
+    before :each do
+      @user_one.username = "new username"
+    end
+
+    it "should update the model" do
+      @user_one.save
+      @user_one.username.should == "new username"
+    end
+
+    it "should return true" do
+      @user_one.save.should be_true
+    end
+
+  end
+
+  describe "destroy" do
+
+    it "should return true" do
+      @user_one.destroy.should be_true
+    end
+
+    it "should set the model to new" do
+      @user_one.destroy
+      @user_one.should be_new
+    end
+
+  end
+
+  describe "count" do
+
+    it "should return the number of users" do
+      User.count.should >= 2
+    end
+
+  end
+
+  describe "all" do
+
+    it "should include the saved user" do
+      begin
+        User.all.should include(@user_one)
+      rescue Object => error
+        puts error.backtrace
+        raise error
+      end
+      User.all.should include(@user_two)
+    end
+
+  end
+
+  describe "user_count" do
+
+    before :each do
+      @rows = User.user_count :returns => :rows
+    end
+
+    it "should return the user count" do
+      @rows.first.value.should >= 2
+    end
+
+  end
+
+end

data/spec/integration/views_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "models"))
+
+describe "integration" do
+
+  use_real_transport!
+
+  before :each do
+    create_users_and_memberships
+  end
+
+  describe "all" do
+
+    it "should include the saved user" do
+      begin
+        User.all.should include(@user_one)
+      rescue Object => error
+        puts error.backtrace
+        raise error
+      end
+      User.all.should include(@user_two)
+    end
+
+  end
+
+  describe "user_count" do
+
+    before :each do
+      @rows = User.user_count :returns => :rows
+    end
+
+    it "should return the user count" do
+      @rows.first.value.should >= 2
+    end
+
+  end
+
+end

data/spec/lib/couch_model/active_model_spec.rb

@@ -36,6 +36,16 @@ describe ActiveTestModel do
     @model = ActiveTestModel.new :id => "test_model_1"
   end
 
+  it "should fullfill all the lint tests" do
+    test_to_key
+    test_to_param
+    test_valid?
+    test_persisted?
+    test_model_naming
+    test_errors_aref
+    test_errors_full_messages
+  end
+
   describe "initialize" do
 
     it "should call the initialize callback" do
@@ -44,20 +54,8 @@ describe ActiveTestModel do
 
   end
 
-  describe "new_record?" do
-
-    it "should fullfill the lint test" do
-      test_new_record?
-    end
-
-  end
-
   describe "destroyed?" do
 
-    it "should fullfill the lint test" do
-      test_destroyed?
-    end
-
     it "should return true if model is new" do
       @model.stub!(:new?).and_return(true)
       @model.should be_destroyed
@@ -65,14 +63,6 @@ describe ActiveTestModel do
 
   end
 
-  describe "naming" do
-
-    it "should fullfill the lint test" do
-      test_model_naming
-    end
-
-  end
-
   describe "valid?" do
 
     it "should be true with a given name" do
@@ -125,6 +115,10 @@ describe ActiveTestModel do
 
   describe "to_param" do
 
+    before :each do
+      @model.stub!(:persisted?).and_return(true)
+    end
+
     it "should return the model's id" do
       @model.to_param.should == @model.id
     end
@@ -244,7 +238,10 @@ describe ActiveTestModel do
     end
 
     it "should return all attributes as json" do
-      @model.to_json.should == "{\"_id\":\"test_model_1\",\"email\":\"test\",\"model_class\":\"ActiveTestModel\",\"name\":\"test\"}"
+      @model.to_json.should =~ /"_id":"test_model_1"/
+      @model.to_json.should =~ /"email":"test"/
+      @model.to_json.should =~ /"model_class":"ActiveTestModel"/
+      @model.to_json.should =~ /"name":"test"/
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Philipp Bruell
@@ -14,10 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +02:00
+date: 2010-05-05 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: CouchModel provides an interface to easly handle CouchDB documents. It also comes with a ActiveModel implementation to integrate into an Rails 3 application.
 email: b.phifty@gmail.com
 executables: []
@@ -70,9 +81,13 @@ files:
 - spec/lib/core_extension/string_spec.rb
 - spec/lib/core_extension/array_spec.rb
 - spec/fake_transport_helper.rb
+- spec/integration/views_spec.rb
+- spec/integration/associations_spec.rb
 - spec/integration/design/membership.design
 - spec/integration/design/user.design
-- spec/integration/basic_spec.rb
+- spec/integration/saved_model_spec.rb
+- spec/integration/new_model_spec.rb
+- spec/integration/models.rb
 - spec/fake_transport.yml
 has_rdoc: true
 homepage: http://github.com/phifty/couchmodel
@@ -122,4 +137,7 @@ test_files:
 - spec/lib/couch_model_spec.rb
 - spec/lib/core_extension/string_spec.rb
 - spec/lib/core_extension/array_spec.rb
-- spec/integration/basic_spec.rb
+- spec/integration/views_spec.rb
+- spec/integration/associations_spec.rb
+- spec/integration/saved_model_spec.rb
+- spec/integration/new_model_spec.rb

data/spec/integration/basic_spec.rb

@@ -1,185 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "couch_model"))
-
-CouchModel::Configuration.design_directory = File.join File.dirname(__FILE__), "design"
-
-DATABASE = {
-  :url                => "http://localhost:5984/test",
-  :create_if_missing  => true,
-  :delete_if_exists   => true,
-  :push_design        => true
-}.freeze unless defined?(DATABASE)
-
-class User < CouchModel::Base
-
-  setup_database DATABASE
-
-  key_accessor :username
-  key_accessor :email, :default => "no email"
-
-  has_many :memberships,
-           :class_name  => "Membership",
-           :view_name   => :by_user_id_and_created_at,
-           :query       => lambda { |created_at| { :startkey => [ self.id, (created_at || nil) ], :endkey => [ self.id, (created_at || { }) ] } }
-
-end
-
-class Membership < CouchModel::Base
-
-  setup_database DATABASE
-
-  key_accessor :created_at
-
-  belongs_to :user, :class_name => "User"
-
-end
-
-describe "integration" do
-
-  use_real_transport!
-
-  context "on new models" do
-
-    before :each do
-      @user = User.new :username => "user"
-    end
-
-    describe "setup" do
-
-      it "should have been created the database" do
-        User.database.exists?.should be_true
-      end
-
-      it "should have been created the design" do
-        User.design.exists?.should be_true
-      end
-
-      it "should setup unique databases" do
-        User.database.should === Membership.database
-      end
-
-      it "should setup designs for each model" do
-        User.design.should_not == Membership.design
-      end
-
-    end
-
-    describe "save" do
-
-      it "should create the model" do
-        @user.save
-        @user.should_not be_new
-      end
-
-      it "should return true" do
-        @user.save.should be_true
-      end
-
-    end
-
-  end
-
-  context "on saved models" do
-
-    before :each do
-      @user_one = User.create :username => "user one"
-      @user_two = User.create :username => "user two"
-      @membership_one = Membership.create :created_at => "yesterday", :user => @user_one
-      @membership_two = Membership.create :created_at => "yesterday", :user => @user_two
-    end
-
-    describe "save" do
-
-      before :each do
-        @user_one.username = "new username"
-      end
-
-      it "should update the model" do
-        @user_one.save
-        @user_one.username.should == "new username"
-      end
-
-      it "should return true" do
-        @user_one.save.should be_true
-      end
-
-    end
-
-    describe "destroy" do
-
-      it "should return true" do
-        @user_one.destroy.should be_true
-      end
-
-      it "should set the model to new" do
-        @user_one.destroy
-        @user_one.should be_new
-      end
-
-    end
-
-    describe "all" do
-
-      it "should include the saved user" do
-        begin
-          User.all.should include(@user_one)
-        rescue Object => error
-          puts error.backtrace
-          raise error
-        end
-        User.all.should include(@user_two)
-      end
-
-    end
-
-    describe "count" do
-
-      it "should return the number of users" do
-        User.count.should >= 2
-      end
-
-    end
-
-    describe "belongs_to" do
-
-      it "should return the related model" do
-        @membership_one.user.should == @user_one
-        @membership_two.user.should == @user_two
-      end
-
-    end
-
-    describe "has_many" do
-
-      it "should include the related model" do
-        @user_one.memberships.should include(@membership_one)
-        @user_two.memberships.should include(@membership_two)
-      end
-
-      it "should not include the not-related model" do
-        @user_one.memberships.should_not include(@membership_two)
-        @user_two.memberships.should_not include(@membership_one)
-      end
-
-      it "should use the selector" do
-        @user_one.memberships("yesterday").should include(@membership_one)
-        @user_one.memberships("today").should_not include(@membership_one)
-      end
-
-    end
-
-    describe "user_count" do
-
-      before :each do
-        @rows = User.user_count :returns => :rows
-      end
-
-      it "should return the user count" do
-        @rows.first.value.should >= 2
-      end
-
-    end
-
-  end
-
-end