embedded_record 0.0.1 → 0.0.2

data/README.md

@@ -9,6 +9,8 @@ EmbeddedRecord is designed to do two things:
 * Define records on a Class
 * Embed one or many records (similiar to belongs\_to and
 has\_and\_belongs\_to\_many associations)
+* See example Rails app:
+  [EmbeddedRecordExample](https://github.com/wojtekmach/embedded_record_example)
 
 ## SYNOPSIS:
 
@@ -31,7 +33,7 @@ Color.first
 Color.last
 
 blue = Color.find(:blue)
-puts blue.id    # => :blue
+p blue.id    # => :blue
 
 p blue.index # => 2
 p blue.name  # => "Blue"
@@ -46,7 +48,7 @@ Embedding record:
 class Car
   attr_accessor :color_mask # integer id of a record
   include EmbeddedRecord
-  embed_record :color, :class => Color
+  embed_record :color
 end
 
 car = Car.new
@@ -61,7 +63,7 @@ Embedding records:
 class Car
   attr_accessor :colors_mask # integer bitmask of record ids
   include EmbeddedRecord
-  embed_records :colors, :class => Color, :singular => :color
+  embed_records :colors
 end
 
 car = Car.new
@@ -77,7 +79,7 @@ None
 
 ## INSTALL:
 
-* `gem install embedded\_record`
+* `gem install embedded_record`
 
 ## LICENSE:
 

data/lib/embedded_record.rb

@@ -1,5 +1,5 @@
 module EmbeddedRecord
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   def self.included(klass)
     klass.extend self
@@ -10,9 +10,7 @@ module EmbeddedRecord
   #   - :class - Class to embed
   #   - :scope - Boolean wheter to install ActiveRecord scope
   def embed_record(name, options = {})
-    raise ArgumentError, "Option :class is required" unless options[:class]
-
-    klass = options[:class]
+    klass = options[:class] || EmbeddedRecord.constantize(name)
     attr = "#{name}_mask"
     all = klass.all
 
@@ -52,12 +50,8 @@ module EmbeddedRecord
   #   end
   #
   def embed_records(name, options = {})
-    [:class, :singular].each do |opt|
-      raise ArgumentError, "Option :#{opt} is required" unless options[opt]
-    end
-
-    singular = options[:singular]
-    klass = options[:class]
+    singular = options[:singular] || EmbeddedRecord.singularize(name)
+    klass = options[:class] || EmbeddedRecord.constantize(singular)
     all_ids = klass.all.map { |obj| obj.id }
     attr = "#{name}_mask"
 
@@ -86,22 +80,20 @@ module EmbeddedRecord
   end
 
   def embed_record_scope(name)
-    klass = name.to_s.classify.constantize
-    plural = name.to_s.pluralize
+    klass = EmbeddedRecord.constantize(name)
 
-    send :scope, :"with_#{name.to_s.tableize}", lambda { |*ids|
+    send :scope, :"with_#{name}", lambda { |*ids|
       masks = ids.map { |id| klass.find(id).index }
-      where("#{plural}_mask in (?)", masks)
+      where("#{name}_mask in (?)", masks)
     }
   end
 
   def embed_records_scope(name)
-    klass = name.to_s.classify.constantize
-    plural = name.to_s.pluralize
+    klass = EmbeddedRecord.constantize(name)
 
-    send :scope, :"with_#{name.to_s.tableize}", lambda { |*ids|
+    send :scope, :"with_#{name}", lambda { |*ids|
       masks = ids.map { |id| 2 ** klass.find(id).index }.join(" | ")
-      where("#{plural}_mask & (?)", masks)
+      where("#{name}_mask & (?)", masks)
     }
   end
 
@@ -110,6 +102,32 @@ private
   def embed_id_type_method(klass)
     klass.ids.first.is_a?(Symbol) ? :to_sym : :to_s
   end
+
+  def self.constantize(str)
+    if defined?(ActiveSupport::Inflector)
+      return ActiveSupport::Inflector.constantize(str)
+    end
+
+    # Stolen from ActiveSupport::Inflector
+    cls = str.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    Kernel.const_get(cls)
+  end
+
+  def self.singularize(str)
+    if defined?(ActiveSupport::Inflector)
+      return ActiveSupport::Inflector.singularize(str)
+    end
+
+    str.to_s[0..-2]
+  end 
+ 
+  def self.pluralize(str)
+    if defined?(ActiveSupport::Inflector)
+      return ActiveSupport::Inflector.pluralize(str)
+    end
+
+    str.to_s + "s"
+  end
 end
 
 module EmbeddedRecord::Record

data/test/embedded_record_test.rb

@@ -70,14 +70,14 @@ describe "Class with EmbeddedRecord" do
   end
 
   it "#embed_record defines <name>, <name>_id, <name>_id= methods" do
-    @cls.embed_record :color, :class => Color
+    @cls.embed_record :color
     @cls.method_defined?(:color).must_equal true
     @cls.method_defined?(:color_id).must_equal true
     @cls.method_defined?(:color_id=).must_equal true
   end
 
   it "#embed_records defines <name>, <name>_ids, <name>_ids= methods" do
-    @cls.embed_records :colors, :class => Color, :singular => :color
+    @cls.embed_records :colors
     @cls.method_defined?(:colors).must_equal true
     @cls.method_defined?(:color_ids).must_equal true
     @cls.method_defined?(:color_ids=).must_equal true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedded_record
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: