pat-maddox-fixjour 0.1.5 → 0.1.6

data/lib/fixjour.rb

@@ -2,7 +2,6 @@ $LOAD_PATH << File.dirname(__FILE__)
 
 require 'rubygems'
 require 'activerecord'
-require 'core_ext/hash'
 require 'core_ext/object'
 require 'fixjour/merging_proxy'
 require 'fixjour/redundant_check'
@@ -14,6 +13,7 @@ require 'fixjour/definitions'
 require 'fixjour/counter'
 require 'fixjour/builders'
 require 'fixjour/deprecation'
+require 'fixjour/attributes'
 
 # This method is just for prettiness
 def Fixjour(options={}, &block)

data/lib/fixjour/attributes.rb

@@ -0,0 +1,25 @@
+module Fixjour
+  class Attributes < Hash
+    def initialize(hash)
+      hash.each do |k, v|
+        self[k.to_s] = v unless v.nil?
+      end
+
+      each do |k, v|
+        (class << self; self; end).send(:define_method, k) { v }
+      end
+    end
+
+    def [](key)
+      super key.to_s
+    end
+
+    def has_key?(key)
+      super key.to_s
+    end
+
+    def ==(other)
+      other.all? {|k, v| self[k] == v }
+    end
+  end
+end

data/lib/fixjour/builders.rb

@@ -1,8 +1,5 @@
 module Fixjour
-  def counter(key=nil)
-    Counter.counter(key)
-  end
-
+  include Counter
   class << self
     include Definitions
 
@@ -29,7 +26,7 @@ module Fixjour
       name = name_for(klass)
 
       define_create(name)
-      define_valid_attributes(name)
+      define_valid_attributes(name, options)
     end
 
     # Adds builders to Fixjour.

data/lib/fixjour/counter.rb

@@ -1,30 +1,20 @@
 module Fixjour
-  class Counter
-    class << self
-      def reset(key=nil)
-        key ? counters.delete(key) : counters.clear
-      end
-
-      def counter(key)
-        counters[key] ||= new
-        counters[key].next
-      end
-
-      private
-
-      def counters
-        @counters ||= {}
+  module Counter
+    def self.reset(key=nil)
+      if key
+        @counters[key] = lambda { s ||= 0; s += 1 }
+      else
+        @counters = Hash.new { |h,k| s ||= 0; c = lambda { s += 1 }; h[k] = c }
       end
     end
-
     reset
 
-    def initialize
-      @value = 0
+    def self.counter(key)
+      @counters[key][]
     end
 
-    def next
-      @value += 1
+    def counter(key=nil)
+      Counter.counter(key)
     end
   end
 end

data/lib/fixjour/definitions.rb

@@ -15,16 +15,12 @@ module Fixjour
         model
       end
     end
-  
+
     # Defines the valid_*_attributes method
-    def define_valid_attributes(name)
+    def define_valid_attributes(name, options)
       define_method("valid_#{name}_attributes") do |*args|
-        valid_attributes = send("new_#{name}", *args).attributes
-        valid_attributes.delete_if { |key, value| value.nil? }
-        valid_attributes.stringify_keys!
-        valid_attributes.make_indifferent!
-        valid_attributes
+        Attributes.new(options.empty?? send("new_#{name}", *args).attributes : options)
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pat-maddox-fixjour
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -22,26 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: faker
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: acts_as_fu
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: 
 email: patnakajima@gmail.com
 executables: []
@@ -52,9 +32,9 @@ extra_rdoc_files: []
 
 files: 
 - lib/core_ext
-- lib/core_ext/hash.rb
 - lib/core_ext/object.rb
 - lib/fixjour
+- lib/fixjour/attributes.rb
 - lib/fixjour/builders.rb
 - lib/fixjour/counter.rb
 - lib/fixjour/definitions.rb

data/lib/core_ext/hash.rb

@@ -1,9 +0,0 @@
-class Hash
-  # Makes a hash able to be accessed via symbol or string keys.
-  def make_indifferent!
-    keys_values = self.dup
-    indifferent = Hash.new { |h,k| h[k.to_s] if Symbol === k }
-    replace(indifferent)
-    merge!(keys_values)
-  end
-end