nsync 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/nsync/active_record/consumer/methods.rb

@@ -3,13 +3,11 @@ module Nsync
     module Consumer
       module ClassMethods
         def nsync_find(ids)
-          nsync_opts = read_inheritable_attribute(:nsync_opts)
           all(:conditions => {nsync_opts[:id_key] => ids})
         end
 
         def nsync_add_data(consumer, event_type, filename, data)
           data = data.dup
-          nsync_opts = read_inheritable_attribute(:nsync_opts)
           if nsync_opts[:id_key].to_s != "id"
             data[nsync_opts[:id_key].to_s] = data.delete("id")
             create(data)
@@ -31,7 +29,7 @@ module Nsync
           if event_type == :deleted
             destroy
           else
-            nsync_opts = self.class.read_inheritable_attribute(:nsync_opts)
+            nsync_opts = self.class.nsync_opts
             if nsync_opts[:id_key].to_s != "id"
               data[nsync_opts[:id_key].to_s] = data.delete("id")
             else

data/lib/nsync/active_record/methods.rb

@@ -6,18 +6,25 @@ module Nsync
     module ClassMethods
       # Makes this class an Nsync Consumer
       def nsync_consumer(opts={})
-        nsync_opts = {:id_key => :source_id}.merge(opts)
-        write_inheritable_attribute(:nsync_opts, nsync_opts)
+        self.nsync_opts = {:id_key => :source_id}.merge(opts)
         include Nsync::ActiveRecord::Consumer::InstanceMethods
       end
   
       def nsync_producer(opts={})
-        nsync_opts = {:id_key => :id}.merge(opts)
-        write_inheritable_attribute(:nsync_opts, nsync_opts)
+        self.nsync_opts = {:id_key => :id}.merge(opts)
         include Nsync::ActiveRecord::Consumer::InstanceMethods
         include Nsync::Producer::InstanceMethods
         include Nsync::ActiveRecord::Producer::InstanceMethods
       end
+
+      def nsync_opts=(hash_of_options)
+        @nsync_opts = hash_of_options
+      end
+  
+      def nsync_opts
+        return @nsync_opts unless superclass && superclass.respond_to?(:nsync_opts)
+        @nsync_opts ||= superclass.nsync_opts.clone
+      end
     end
   end
 end

data/lib/nsync/class_methods.rb

@@ -3,15 +3,22 @@ module Nsync
   module ClassMethods
     # Makes this class an Nsync Consumer
     def nsync_consumer(opts={})
-      nsync_opts = {:id_key => :source_id}.merge(opts)
-      write_inheritable_attribute(:nsync_opts, nsync_opts)
+      self.nsync_opts = {:id_key => :source_id}.merge(opts)
     end
 
     def nsync_producer(opts={})
-      nsync_opts = {:id_key => :id}.merge(opts)
-      write_inheritable_attribute(:nsync_opts, nsync_opts)
+      self.nsync_opts = {:id_key => :id}.merge(opts)
       include Nsync::Producer::InstanceMethods
     end
+
+    def nsync_opts=(hash_of_options)
+      @nsync_opts = hash_of_options
+    end
+
+    def nsync_opts
+      return @nsync_opts unless superclass && superclass.respond_to?(:nsync_opts)
+      @nsync_opts ||= superclass.nsync_opts.clone
+    end
   end
 end
 

data/lib/nsync/core_extensions.rb

@@ -6,6 +6,14 @@ module Nsync
       string.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
     end
 
+    def self.underscore(camel_cased_word)
+      camel_cased_word.to_s.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
+    
     def self.constantize(string)
       names = string.split('::')
       names.shift if names.size == 0 || names.first.size == 0

data/lib/nsync/producer/methods.rb

@@ -2,7 +2,7 @@ module Nsync
   class Producer
     module InstanceMethods
       def nsync_write
-        nsync_opts = self.class.read_inheritable_attribute(:nsync_opts)
+        nsync_opts = self.class.nsync_opts
         if !nsync_opts[:if] || nsync_opts[:if].call(self)
           Nsync.config.producer_instance.write_file(nsync_filename, to_nsync_hash)
         elsif Nsync.config.producer_instance.file_exists?(nsync_filename)
@@ -15,8 +15,8 @@ module Nsync
       end
 
       def nsync_filename
-        nsync_opts = self.class.read_inheritable_attribute(:nsync_opts)
-        File.join(self.class.to_s.underscore, "#{send(nsync_opts[:id_key])}.json")
+        nsync_opts = self.class.nsync_opts
+        File.join(CoreExtensions.underscore(self.class.to_s), "#{send(nsync_opts[:id_key])}.json")
       end
     end
   end

data/nsync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nsync}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hughes"]
-  s.date = %q{2011-06-13}
+  s.date = %q{2011-06-30}
   s.description = %q{Nsync is designed to allow you to have a separate data
   processing app with its own data processing optimized database and a consumer
   app with its own database, while keeping the data as in sync as you want it.}
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/schleyfox/nsync}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.0}
+  s.rubygems_version = %q{1.4.1}
   s.summary = %q{Keep your data processors and apps in sync}
   s.test_files = [
     "test/active_record_test.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nsync
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ben Hughes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -04:00
+date: 2011-06-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.0
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Keep your data processors and apps in sync