devise_couch 0.1.1 → 0.1.2

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
-#gem 'rails', '3.0.0.rc'
-gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'rails', '3.0.0'
+#gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'warden'
 gem 'devise', :git => 'git://github.com/plataformatec/devise.git'
@@ -16,4 +16,4 @@ gem 'rails3-generators', :git => 'git://github.com/shenoudab/rails3-generators.g
 
 gem 'webrat', '0.7.0'
 gem 'mocha', :require => false
-gem 'bcrypt-ruby', :require => 'bcrypt'
+gem 'bcrypt-ruby', :require => 'bcrypt'

data/README.markdown

@@ -2,25 +2,6 @@
 
 *devise_couch* will let you use [devise](http://github.com/plataformatec/devise) with [CocuhrestModel](http://github.com/couchrest/couchrest_model). 
 
-*devise_couch* is intended for use with *Rails 3* and *Devise 1.1.1*. It may work with earlier versions of devise, but it's not been tested.
-
-This README only covers *devise_couch* specifics. Make sure to read the [devise README](http://github.com/plataformatec/devise/blob/master/README.rdoc)
-
-## Usage options
-
-The gem gives you the options of 2 ORM setups depending on what library you wish to use for validations:   
-
-* *couchrest_model* - Uses CocuhrestModel validations 
-* *couchrest_model_active_model* - Uses ActiveModel::Validations
-
-The advantage to this is ActiveModel's I18n support for error messages, and it uses the same validations lib as devise does by default.
-
-## ActiveModel compatibility 
-
-Currently only the <code>couchrest_model</code> option has been tested. 
-There should be full ActiveModel support in a future version of CocuhrestModel, after Rails 3 is released.
-ActiveModel support will likely be part of *CocuhrestModel 1.0* (as mentioned by jnunemaker in a post).
-
 ## Installation
 
 Add *devise*, *devise_couch* and *couchrest_model* gems to your Gemfile (your Rails app Gemfile). The following gems are required
@@ -33,10 +14,8 @@ Add *devise*, *devise_couch* and *couchrest_model* gems to your Gemfile (your Ra
   gem 'devise_couch'
   gem 'rails3-generators', :git => 'git://github.com/shenoudab/rails3-generators.git'
 </pre>
-
-<pre>gem install rails3-generators</pre>
   
-Alternatively use bundler to install all required gems in your Rails 3 app 
+Use bundler to install all required gems in your Rails 3 app 
 
 <pre>bundle install</pre>
 
@@ -46,7 +25,7 @@ Run the generator:
 
 The generator will install an initializer which describes ALL Devise's
 configuration options and you MUST take a look at it. Make sure to specify
-either <code>mongo_mapper</code> or <code>mongo_mapper_active_model</code> (ActiveModel::Validations) 
+either <code>couchrest_model</code> (ActiveModel::Validations) 
 as the orm in the configuration file.
 
 To add Devise to any of your models using the generator:

data/Rakefile

@@ -49,6 +49,7 @@ spec = Gem::Specification.new do |s|
   s.email = "sbertel@mobithought.com"
   s.homepage = "http://github.com/shenoudab/devise_couch"
   s.author = 'Shenouda Bertel'
+  s.require_path = 'lib'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -57,4 +58,4 @@ end
 desc "Install the gem #{spec.name}-#{spec.version}.gem"
 task :install do
   system("gem install pkg/#{spec.name}-#{spec.version}.gem --no-ri --no-rdoc")
-end
+end

data/lib/devise/orm/couchrest_model/compatibility.rb

@@ -2,25 +2,9 @@ module Devise
   module Orm
     module CouchrestModel
       module Compatibility
-        extend ActiveSupport::Concern
-
         extend ActiveSupport::Concern
         extend ActiveModel::Naming
 
-        include ActiveModel::Serializers::Xml
-        include ActiveModel::Serializers::JSON
-
-        def to_xml(options = {}, &block)
-          options[:except] ||= []
-          options[:except] << :_id
-
-          super options do |b|
-            b.id self.id
-            block.call(b) if block_given?
-          end
-        end
-
-
         module ClassMethods
           # Hooks for confirmable
           def before_create(*args)
@@ -48,42 +32,8 @@ module Devise
               METHOD
             end
           end
-
-          # Add ActiveRecord like finder
-          def find(*args)
-            case args.first
-            when :first, :all
-              send(args.shift, *args)
-            else          
-              where(:'_id' => args.first).first
-            end
-          end
-        end
-
-        # def changed?
-        #   dirty?
-        # end
-
-        def save(options=nil)
-          if options.is_a?(Hash) && options[:validate] == false
-            save!
-          else
-            super()
-          end
-        end
-
-        def update_attribute(name, value)
-          update_attributes(name => value)
-        end
-        # 
-        # def update_attributes(*args)
-        #   update(*args)
-        # end
-
-        def invalid?
-          !valid?
         end
       end
     end
   end
-end
+end

data/lib/devise/orm/couchrest_model.rb

@@ -1,4 +1,5 @@
-require "couchrest/model/base"
+require 'couchrest/model/base'
+require 'devise/orm/couchrest_model/compatibility'
 
 module Devise
   module Orm
@@ -6,24 +7,24 @@ module Devise
       module Hook
         def devise_modules_hook!
           extend Schema
-          #Include Compatibility
+          #include Compatibility
           yield
           return unless Devise.apply_schema
           devise_modules.each { |m| send(m) if respond_to?(m, true) }
         end
-      end #Hook
+      end
 
       module Schema
         include Devise::Schema
         # Tell how to apply schema methods.
         def apply_devise_schema(name, type, options={})
           return unless Devise.apply_schema
-          property name, :type => type
+          property name, type, options
         end
-      end #Module Schema
-    end #CouchRest
-  end #Orm
-end #Devise
+      end
+    end
+  end
+end
 
 module CouchRest
   module Model

data/lib/devise_couch/version.rb

@@ -1,5 +1,5 @@
 module CouchrestModel
   module Devise
-    VERSION = "0.1.1".freeze
+    VERSION = "0.1.2".freeze
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Shenouda Bertel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +02:00
+date: 2010-09-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -33,11 +33,7 @@ files:
 - Rakefile
 - README.markdown
 - lib/devise_couch/version.rb
-- lib/devise/orm/couchrest_model/date_time.rb
-- lib/devise/orm/couchrest_model/schema.rb
-- lib/devise/orm/couchrest_model/couch_validations.rb
 - lib/devise/orm/couchrest_model/compatibility.rb
-- lib/devise/orm/couchrest_model_active_model.rb
 - lib/devise/orm/couchrest_model.rb
 - lib/generators/couchrest_model/devise_generator.rb
 has_rdoc: true

data/lib/devise/orm/couchrest_model/couch_validations.rb

@@ -1,88 +0,0 @@
-module Validatable
-  # Monkey-patch Validatable::Errors to support generation of error message from a Symbol.
-  class Errors                 
-    @@default_error_messages = {}
-
-    # Holds a hash with all the default error messages that can be replaced by your own copy or localizations.
-    def self.default_error_messages=(default_error_messages)
-      @@default_error_messages = default_error_messages
-    end
-
-    def self.default_error_message(key, field, *values)
-      field = field.to_s.humanize
-      @@default_error_messages[key] % [field, *values].flatten
-    end
-      
-    # original add before monkey-patch
-    # def add(attribute, message) #:nodoc:
-    #   errors[attribute.to_sym] = [] if errors[attribute.to_sym].nil?
-    #   errors[attribute.to_sym] << message
-    # end
-
-    alias_method :original_add, :add
-    
-    # If the message is a Symbol, allow +default_error_message+ to generate
-    # the message, including translation.
-    def add(field_name, message)
-      if message.kind_of?(Symbol)
-        message = self.class.default_error_message(message, field_name)
-      end                    
-      fld_name = field_name.to_sym
-      errors[fld_name] = [] if errors[fld_name].nil?
-      original_add(fld_name, message) unless errors[fld_name].include?(message)
-    end        
-  end
-end
-
-module Validatable 
-  class ValidatesPresenceOf < ValidationBase #:nodoc:
-    def message(instance)
-      super || "can't be blank"
-    end
-  end
-end
-
-module Validatable
-  class ValidatesLengthOf < ValidationBase #:nodoc:    
-    def message(instance)
-      min = !within.nil? ? within.first : minimum
-      max = !within.nil? ? within.last : maximum
-      super || "must be between #{min} and #{max} characters long"
-    end
-  end
-end
-
-
-# Default error messages consistent with ActiveModel messages and devise
-# expectations.
-Validatable::Errors.default_error_messages = {
-  :absent => 'must be absent',
-  :inclusion => 'is not included in the list',
-  :exclusion => 'is reserved',
-  :invalid => 'is invalid',
-  :confirmation => " doesn't match confirmation",
-  :accepted => 'must be accepted',
-  :nil => 'must not be nil',
-  :empty => "can't be empty",
-  :blank => "can't be blank",
-  :length_between => 'must be between %s and %s characters long',
-  :too_long => 'is too long (maximum is %s characters)',
-  :too_short => 'is too short (minimum is %s characters)',
-  :wrong_length => 'is the wrong length (should be %s characters)',
-  :taken => 'has already been taken',
-  :not_a_number => 'is not a number',
-  :not_an_integer => 'must be an integer',
-  :greater_than => 'must be greater than %s',
-  :greater_than_or_equal_to => 'must be greater than or equal to ',
-  :equal_to => 'must be equal to %s',
-  :not_equal_to => 'must not be equal to %s',
-  :less_than => 'must be less than %s',
-  :less_than_or_equal_to => 'must be less than or equal to %s',
-  :value_between => 'must be between %s and %s',
-  :odd => 'must be odd',
-  :even => 'must be even',
-  :primitive => 'must be of type %s',
-  :not_found => 'not found',
-  :already_confirmed => 'was already confirmed',
-  :not_locked => 'was not locked'  
-}

data/lib/devise/orm/couchrest_model/date_time.rb

@@ -1,14 +0,0 @@
-class Date
-  unless method_defined?(:gmtime)
-    delegate :gmtime, :to => :to_time
-  end
-
-  def utc           
-    Time.zone.parse("#{hour.to_i - zone.to_i}:#{min}:#{sec}")
-    # self.to_datetime.new_offset(0)
-  end
-  
-  def to_i
-    to_time.utc.to_i
-  end
-end

data/lib/devise/orm/couchrest_model/schema.rb

@@ -1,85 +0,0 @@
-module CouchrestModel
-  class ValidationUtil
-    class << self
-      attr_accessor :counter
-  
-      def inc_counter
-        @counter ||= 0 
-        @counter += 1
-      end
-    end
-  end
-end
-module Devise
-  module Orm
-    module CouchrestModel
-      module Schema  
-        include Devise::Schema
-
-        SCHEMA_OPTIONS = {
-          :null  => :required,
-          :limit => :length
-        }
-
-        # Tell how to apply schema methods. This automatically maps :limit to
-        # :length and :null to :required.
-        def apply_devise_schema(name, type, options={})
-          SCHEMA_OPTIONS.each do |old_key, new_key|
-            next unless options.key?(old_key)
-            if :null == old_key
-              # :required is opposite of :null
-              options[new_key] = !options.delete(old_key)
-            else
-              options[new_key] = options.delete(old_key)
-            end
-          end
-          
-          options.delete(:default) if options[:default].nil?
-          required_option = options.delete(:required)          
-          length_option = options.delete(:length)          
-
-          type = Time if type == DateTime         
-
-          key name, type, options
-          
-          counter = ::CouchrestModel::ValidationUtil.inc_counter
-        
-          handle_email(name, counter) if name == :email          
-          handle_length(name, counter, length_option) if length_option
-          handle_required(name, counter) if required_option                               
-        end  
-        
-        protected
-
-        def make_key prefix, name, counter
-          "#{prefix}_#{name}_#{counter}"
-        end
-
-        def handle_required name, counter          
-          key = make_key :presence, name, counter 
-          validates_presence_of name.to_sym, :key => key
-        end
-
-        def handle_email name, counter            
-          key = make_key :unique, name, counter
-          validates_uniqueness_of name.to_sym, :key => key
-        end
-
-        def handle_length name, counter, length_option
-          key = make_key :length, name, counter
-          options = case length_option
-          when Fixnum
-            {:maximum => length_option}
-          when Hash
-            length_option
-          else
-            raise ArgumentError, "length validation option must be either a Fixnum or Hash"                                
-          end            
-          options[:key] = key            
-          
-          validates_length_of name.to_sym, options
-        end        
-      end
-    end
-  end
-end

data/lib/devise/orm/couchrest_model_active_model.rb

@@ -1,66 +0,0 @@
-require 'devise/orm/couchrest_model/compatibility'
-require 'devise/orm/couchrest_model/schema'
-require 'devise/orm/couchrest_model/date_time'
-
-module Devise
-  module Orm
-    module CouchrestModel
-      module Hook
-        def devise_modules_hook!
-          extend Schema
-          include ActiveModel::Validations
-          include ActiveModelCompatibility
-          include Compatibility
-          class << self; attr_reader :descendants; end;
-
-          def self.validates_uniqueness_of(*fields)
-            validates_with UniquenessValidator, _merge_attributes(fields)
-          end
-          
-          yield
-
-          return unless Devise.apply_schema
-          devise_modules.each { |m| send(m) if respond_to?(m, true) }
-        end
-      end
-
-      # http://github.com/jkaramon/CouchrestModel/blob/rails3/lib/couchrest_model/plugins/validations.rb
-      # ==============================================================
-      #   validates_each in couchrest_model should work just fine!
-      # ==============================================================
-
-      # class UniquenessValidator < ActiveModel::EachValidator
-      #   def validate_each(target, attribute, value)
-      #     resource = ::DataMapper.repository(target.repository.name) { target.model.first(attribute => value) }
-      #     if resource.nil? || (target.saved? && resource.key == target.key)
-      #       return true
-      #     else
-      #       target.errors.add(attribute, :taken)
-      #       return false
-      #     end
-      #   end
-      # end
-
-      module ActiveModelCompatibility
-        # include ActiveModel::Validations does not make save check valid?.
-        # This may not be the best solution, but it seems to work. Note that
-        # Compatibility is included after this module; its #save method handles
-        # the :validate => false option.
-        def save(*args)
-          retval = valid? && super(*args)
-          assert_save_successful(:save, retval)
-          retval
-        end
-      end
-    end
-  end
-end
-
-module CouchRest
-  module Model
-    class Base
-      extend ::Devise::Models
-      extend ::Devise::Orm::CouchrestModel::Hook
-    end
-  end
-end