perry 0.6.2 → 0.6.3

data/lib/perry.rb

@@ -1,6 +1,5 @@
 # TRP: Cherry pick some goodies from active_support
 require 'active_support/core_ext/array'
-require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/conversions'

data/lib/perry/base.rb

@@ -1,4 +1,5 @@
 # TRP: Perry modules
+require 'perry/support/class_attributes'
 require 'perry/errors'
 require 'perry/associations/contains'
 require 'perry/associations/external'
@@ -8,6 +9,7 @@ require 'perry/scopes'
 require 'perry/adapters'
 
 class Perry::Base
+  include Perry::Support::ClassAttributes
   include Perry::Associations::Contains
   include Perry::Associations::External
   include Perry::Serialization
@@ -20,11 +22,12 @@ class Perry::Base
   alias :saved? :saved
   alias :persisted? :saved?
 
-  class_inheritable_accessor :read_adapter, :write_adapter,
-    :defined_attributes, :scoped_methods, :defined_associations
+  class_attributes :read_adapter, :write_adapter
+  class_attributes :defined_attributes, :scoped_methods, :defined_associations, :scopes
 
   self.defined_associations = {}
   self.defined_attributes = []
+  self.scopes = {}
 
   def initialize(attributes={})
     self.new_record = true
@@ -127,7 +130,7 @@ class Perry::Base
 
     def write_with(adapter_type)
       if write_adapter
-        write_inheritable_attribute :write_adapter, nil if adapter_type != write_adapter.type
+        self.write_adapter = nil if adapter_type != write_adapter.type
       else
         # TRP: Pull in methods and libraries needed for mutable functionality
         require 'perry/persistence' unless defined?(Perry::Persistence)
@@ -194,7 +197,7 @@ class Perry::Base
     private
 
     def setup_adapter(mode, config)
-      current_adapter = read_inheritable_attribute :"#{mode}_adapter"
+      current_adapter = self.send(:"#{mode}_adapter")
       type = config[:type] if config.is_a?(Hash)
 
       new_adapter = if type == :none
@@ -205,7 +208,7 @@ class Perry::Base
         Perry::Adapters::AbstractAdapter.create(type, config)
       end
 
-      write_inheritable_attribute :"#{mode}_adapter", new_adapter
+      self.send(:"#{mode}_adapter=", new_adapter)
     end
 
     def configure_adapter(mode, &block)

data/lib/perry/core_ext/kernel/singleton_class.rb

@@ -12,3 +12,4 @@ module Kernel
     singleton_class.class_eval(*args, &block)
   end
 end
+

data/lib/perry/scopes.rb

@@ -1,20 +1,16 @@
 require 'perry/scopes/conditions'
 
 module Perry::Scopes
-  
+
   module ClassMethods
-    
-    def scopes
-      read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
-    end
-    
+
     def scoped
       current_scope ? relation.merge(current_scope) : relation.clone
     end
-    
+
     def scope(name, scope_options={})
       name = name.to_sym
-      
+
       # TRP: Define the scope and merge onto the relation
       scopes[name] = lambda do |*args|
         options = scope_options.is_a?(Proc) ? scope_options.call(*args) : scope_options
@@ -24,22 +20,22 @@ module Perry::Scopes
           scoped.merge(options)
         end
       end
-      
+
       # TRP: Bind the above block to a method for easy access
       singleton_class.send(:define_method, name, &scopes[name])
     end
-    
+
   end
-  
+
   module InstanceMethods
-    
+
   end
-  
+
   def self.included(receiver)
     receiver.extend         ClassMethods
     receiver.send :include, InstanceMethods
-    
+
     receiver.extend Conditions
   end
-  
+
 end

data/lib/perry/serialization.rb

@@ -37,7 +37,7 @@ module Perry::Serialization
 
   def self.included(receiver)
     receiver.class_eval do
-      class_inheritable_accessor :serialized_attributes
+      class_attribute :serialized_attributes
       self.serialized_attributes = []
     end
 
@@ -45,4 +45,4 @@ module Perry::Serialization
     receiver.send :include, InstanceMethods
   end
 
-end
+end

data/lib/perry/support/class_attributes.rb

@@ -0,0 +1,48 @@
+module Perry::Support; end
+
+module Perry::Support::ClassAttributes
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+
+    def class_attribute(*attrs)
+      @class_attributes ||= []
+      @class_attributes += attrs
+      attrs.each do |attr|
+        class_eval %{
+          def self.#{attr}
+            @#{attr}
+          end
+          def self.#{attr}=(value = nil)
+            @#{attr} = value
+          end
+          def #{attr}
+            self.class.#{attr}
+          end
+          def #{attr}=(value = nil)
+            self.class.#{attr} = value
+          end
+        }
+      end
+      @class_attributes
+    end
+    alias :class_attributes :class_attribute
+
+    def inherited(subclass)
+      (["class_attributes"] + class_attributes).each do |t|
+        ivar = "@#{t}"
+        value = instance_variable_get(ivar)
+        subclass.instance_variable_set(
+          ivar,
+          value.duplicable? ? value.dup : value
+        )
+      end
+    end
+
+  end
+
+end
+

data/lib/perry/version.rb

@@ -3,7 +3,7 @@ module Perry
 
     MAJOR = 0
     MINOR = 6
-    TINY  = 2
+    TINY  = 3
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: perry
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Travis Petticrew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 Z
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -168,6 +168,7 @@ files:
 - lib/perry/scopes/conditions.rb
 - lib/perry/scopes.rb
 - lib/perry/serialization.rb
+- lib/perry/support/class_attributes.rb
 - lib/perry/version.rb
 - lib/perry.rb
 homepage: http://github.com/tpett/perry
@@ -200,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Ruby library for querying and mapping data through generic interfaces