couchrest_model 1.0.0.beta8 → 1.0.0

data/spec/couchrest/subclass_spec.rb

@@ -92,8 +92,8 @@ describe "Subclassing a Model" do
     OnlineCourse.design_doc['views'].keys.should_not include('by_title')
   end
   
-  it "should have an all view with a guard clause for couchrest-type == subclass name in the map function" do
-    OnlineCourse.design_doc['views']['all']['map'].should =~ /if \(doc\['couchrest-type'\] == 'OnlineCourse'\)/
+  it "should have an all view with a guard clause for model == subclass name in the map function" do
+    OnlineCourse.design_doc['views']['all']['map'].should =~ /if \(doc\['#{OnlineCourse.model_type_key}'\] == 'OnlineCourse'\)/
   end
 end
 

data/spec/couchrest/view_spec.rb

@@ -273,6 +273,12 @@ describe "Model views" do
       u = Unattached.first :database=>@db
       u.title.should =~ /\A...\z/
     end
+    
+    it "should get last" do
+      u = Unattached.last :database=>@db
+      u.title.should == "aaa"
+    end
+    
     it "should barf on all_design_doc_versions if no database given" do
       lambda{Unattached.all_design_doc_versions}.should raise_error
     end

data/spec/fixtures/more/article.rb

@@ -9,7 +9,7 @@ class Article < CouchRest::Model::Base
   view_by :tags,
     :map => 
       "function(doc) {
-        if (doc['couchrest-type'] == 'Article' && doc.tags) {
+        if (doc['#{model_type_key}'] == 'Article' && doc.tags) {
           doc.tags.forEach(function(tag){
             emit(tag, 1);
           });

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
+require "bundler/setup"
 require "rubygems"
-require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+require "rspec" # Satisfies Autotest and anyone else not using the Rake tasks
 
 require File.join(File.dirname(__FILE__), '..','lib','couchrest_model')
 # check the following file to see how to use the spec'd features.
@@ -10,7 +11,7 @@ unless defined?(FIXTURE_PATH)
 
   COUCHHOST = "http://127.0.0.1:5984"
   TESTDB    = 'couchrest-model-test'
-  TEST_SERVER    = CouchRest.new
+  TEST_SERVER    = CouchRest.new COUCHHOST
   TEST_SERVER.default_database = TESTDB
   DB = TEST_SERVER.database(TESTDB)
 end
@@ -24,7 +25,7 @@ def reset_test_db!
   DB
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:all) { reset_test_db! }
   
   config.after(:all) do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest_model
 version: !ruby/object:Gem::Version 
-  hash: -1848230060
-  prerelease: true
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 0
   - 0
-  - beta8
-  version: 1.0.0.beta8
+  version: 1.0.0
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -20,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 -03:00
+date: 2011-01-16 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,12 +30,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -55,54 +54,101 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: activemodel
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activemodel
+  name: tzinfo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 63
         segments: 
-        - 3
-        - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - 3
+        - 22
+        version: 0.3.22
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: tzinfo
+  name: railties
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 7
         segments: 
-        - 0
         - 3
-        - 22
-        version: 0.3.22
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 5
+        - 7
+        version: 0.5.7
+  type: :development
+  version_requirements: *id008
 description: CouchRest Model provides aditional features to the standard CouchRest Document class such as properties, view designs, associations, callbacks, typecasting and validations.
 email: jchris@apache.org
 executables: []
@@ -114,21 +160,27 @@ extra_rdoc_files:
 - README.md
 - THANKS.md
 files: 
+- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - THANKS.md
+- VERSION
+- couchrest_model.gemspec
 - history.txt
+- init.rb
 - lib/couchrest/model.rb
 - lib/couchrest/model/associations.rb
-- lib/couchrest/model/attribute_protection.rb
-- lib/couchrest/model/attributes.rb
 - lib/couchrest/model/base.rb
 - lib/couchrest/model/callbacks.rb
 - lib/couchrest/model/casted_array.rb
 - lib/couchrest/model/casted_model.rb
 - lib/couchrest/model/class_proxy.rb
 - lib/couchrest/model/collection.rb
+- lib/couchrest/model/configuration.rb
 - lib/couchrest/model/design_doc.rb
 - lib/couchrest/model/document_queries.rb
 - lib/couchrest/model/errors.rb
@@ -136,6 +188,7 @@ files:
 - lib/couchrest/model/persistence.rb
 - lib/couchrest/model/properties.rb
 - lib/couchrest/model/property.rb
+- lib/couchrest/model/property_protection.rb
 - lib/couchrest/model/support/couchrest.rb
 - lib/couchrest/model/support/hash.rb
 - lib/couchrest/model/typecast.rb
@@ -143,21 +196,24 @@ files:
 - lib/couchrest/model/validations/casted_model.rb
 - lib/couchrest/model/validations/locale/en.yml
 - lib/couchrest/model/validations/uniqueness.rb
+- lib/couchrest/model/view.rb
 - lib/couchrest/model/views.rb
 - lib/couchrest/railtie.rb
 - lib/couchrest_model.rb
 - lib/rails/generators/couchrest_model.rb
 - lib/rails/generators/couchrest_model/model/model_generator.rb
 - lib/rails/generators/couchrest_model/model/templates/model.rb
+- spec/.gitignore
 - spec/couchrest/assocations_spec.rb
 - spec/couchrest/attachment_spec.rb
-- spec/couchrest/attribute_protection_spec.rb
 - spec/couchrest/base_spec.rb
 - spec/couchrest/casted_model_spec.rb
 - spec/couchrest/casted_spec.rb
 - spec/couchrest/class_proxy_spec.rb
+- spec/couchrest/configuration_spec.rb
 - spec/couchrest/inherited_spec.rb
 - spec/couchrest/persistence_spec.rb
+- spec/couchrest/property_protection_spec.rb
 - spec/couchrest/property_spec.rb
 - spec/couchrest/subclass_spec.rb
 - spec/couchrest/validations.rb
@@ -184,15 +240,14 @@ files:
 - spec/fixtures/views/test_view/only-map.js
 - spec/fixtures/views/test_view/test-map.js
 - spec/fixtures/views/test_view/test-reduce.js
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/couchrest/couchrest_model
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -218,24 +273,28 @@ 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: Extends the CouchRest Document for advanced modelling.
 test_files: 
 - spec/couchrest/assocations_spec.rb
 - spec/couchrest/attachment_spec.rb
-- spec/couchrest/attribute_protection_spec.rb
 - spec/couchrest/base_spec.rb
 - spec/couchrest/casted_model_spec.rb
 - spec/couchrest/casted_spec.rb
 - spec/couchrest/class_proxy_spec.rb
+- spec/couchrest/configuration_spec.rb
 - spec/couchrest/inherited_spec.rb
 - spec/couchrest/persistence_spec.rb
+- spec/couchrest/property_protection_spec.rb
 - spec/couchrest/property_spec.rb
 - spec/couchrest/subclass_spec.rb
 - spec/couchrest/validations.rb
 - spec/couchrest/view_spec.rb
+- spec/fixtures/attachments/README
+- spec/fixtures/attachments/couchdb.png
+- spec/fixtures/attachments/test.html
 - spec/fixtures/base.rb
 - spec/fixtures/more/article.rb
 - spec/fixtures/more/card.rb
@@ -250,4 +309,9 @@ test_files:
 - spec/fixtures/more/sale_invoice.rb
 - spec/fixtures/more/service.rb
 - spec/fixtures/more/user.rb
+- spec/fixtures/views/lib.js
+- spec/fixtures/views/test_view/lib.js
+- spec/fixtures/views/test_view/only-map.js
+- spec/fixtures/views/test_view/test-map.js
+- spec/fixtures/views/test_view/test-reduce.js
 - spec/spec_helper.rb

data/lib/couchrest/model/attribute_protection.rb

@@ -1,74 +0,0 @@
-module CouchRest
-  module Model
-    module AttributeProtection
-      # Attribute protection from mass assignment to CouchRest properties
-      # 
-      # Protected methods will be removed from
-      #  * new 
-      #  * update_attributes
-      #  * upate_attributes_without_saving
-      #  * attributes=
-      #  
-      # There are two modes of protection
-      #  1) Declare accessible poperties, assume all the rest are protected 
-      #    property :name, :accessible => true
-      #    property :admin                     # this will be automatically protected
-      #
-      #  2) Declare protected properties, assume all the rest are accessible
-      #    property :name                      # this will not be protected
-      #    property :admin, :protected => true
-      #
-      # Note: you cannot set both flags in a single class
-      
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def accessible_properties
-          properties.select { |prop| prop.options[:accessible] }
-        end
-
-        def protected_properties
-          properties.select { |prop| prop.options[:protected] }
-        end
-      end
-
-      def accessible_properties
-        self.class.accessible_properties
-      end
-
-      def protected_properties
-        self.class.protected_properties
-      end
-
-      def remove_protected_attributes(attributes)
-        protected_names = properties_to_remove_from_mass_assignment.map { |prop| prop.name }
-        return attributes if protected_names.empty?
-
-        attributes.reject! do |property_name, property_value|
-          protected_names.include?(property_name.to_s)
-        end
-
-        attributes || {}
-      end
-
-      private
-
-      def properties_to_remove_from_mass_assignment
-        has_protected = !protected_properties.empty?
-        has_accessible = !accessible_properties.empty?
-
-        if !has_protected && !has_accessible
-          []
-        elsif has_protected && !has_accessible
-          protected_properties
-        elsif has_accessible && !has_protected
-          properties.reject { |prop| prop.options[:accessible] }
-        else
-          raise "Set either :accessible or :protected for #{self.class}, but not both"
-        end
-      end
-    end
-  end
-end

data/lib/couchrest/model/attributes.rb

@@ -1,75 +0,0 @@
-module CouchRest
-  module Model
-    module Attributes
-
-      ## Support for handling attributes
-      # 
-      # This would be better in the properties file, but due to scoping issues
-      # this is not yet possible.
-      #
-
-      def prepare_all_attributes(doc = {}, options = {})
-        apply_all_property_defaults
-        if options[:directly_set_attributes]
-          directly_set_read_only_attributes(doc)          
-        else
-          remove_protected_attributes(doc)
-        end
-        directly_set_attributes(doc) unless doc.nil?
-      end
-
-      # Takes a hash as argument, and applies the values by using writer methods
-      # for each key. It doesn't save the document at the end. Raises a NoMethodError if the corresponding methods are
-      # missing. In case of error, no attributes are changed.    
-      def update_attributes_without_saving(hash)
-        # Remove any protected and update all the rest. Any attributes
-        # which do not have a property will simply be ignored.
-        attrs = remove_protected_attributes(hash)
-        directly_set_attributes(attrs)
-      end
-      alias :attributes= :update_attributes_without_saving
-
-      # Takes a hash as argument, and applies the values by using writer methods
-      # for each key. Raises a NoMethodError if the corresponding methods are
-      # missing. In case of error, no attributes are changed.
-      def update_attributes(hash)
-        update_attributes_without_saving hash
-        save
-      end
-
-      private
-
-      def directly_set_attributes(hash)
-        hash.each do |attribute_name, attribute_value|
-          if self.respond_to?("#{attribute_name}=")
-            self.send("#{attribute_name}=", hash.delete(attribute_name))
-          end
-        end
-      end
-
-      def directly_set_read_only_attributes(hash)
-        property_list = self.properties.map{|p| p.name}
-        hash.each do |attribute_name, attribute_value|
-          next if self.respond_to?("#{attribute_name}=")
-          if property_list.include?(attribute_name)
-            write_attribute(attribute_name, hash.delete(attribute_name))
-          end
-        end
-      end
-      
-      def set_attributes(hash)
-        attrs = remove_protected_attributes(hash)
-        directly_set_attributes(attrs)
-      end
-
-      def check_properties_exist(attrs)
-        property_list = self.properties.map{|p| p.name}
-        attrs.each do |attribute_name, attribute_value|
-          raise NoMethodError, "Property #{attribute_name} not created" unless respond_to?("#{attribute_name}=") or property_list.include?(attribute_name)
-        end      
-      end
-
-    end
-  end
-end
-