lucid_works 0.6.9 → 0.6.10

data/lib/lucid_works.rb

@@ -18,6 +18,7 @@ require 'nokogiri'
 require 'lucid_works/utils'
 require 'lucid_works/patch_restclient'
 require 'lucid_works/patch_time'
+require 'lucid_works/simple_naming'
 
 require 'lucid_works/exceptions'
 require 'lucid_works/associations'

data/lib/lucid_works/base.rb

@@ -33,6 +33,7 @@ module LucidWorks
     extend  ActiveModel::Callbacks
     include Associations
     include Utils::BoolConverter
+    extend SimpleNaming
 
     attr_accessor :parent           # :nodoc:
     attr_writer   :id               # :nodoc:
@@ -48,16 +49,6 @@ module LucidWorks
 
       attr_accessor :collection_name # :nodoc:
       attr_accessor_with_default :singleton, false
-
-      def model_name
-        super.tap do |name|
-          name.instance_eval do
-            def singular; ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).tr('/', '_').freeze; end
-            def plural; singular.pluralize.freeze; end
-            def collection; ActiveSupport::Inflector.tableize(ActiveSupport::Inflector.demodulize(self)).freeze; end
-          end
-        end
-      end
       
       # The attributes for a model are ascertained in on of two ways.
       # Without a schema, the attributes list is automatically generated when the the object is retrieved from the server.

data/lib/lucid_works/collection.rb

@@ -47,7 +47,7 @@ module LucidWorks
     end
 
     def synonyms
-      @synomyms ||= settings.synonym_list.each_with_index.map do |mapping, index|
+      settings.synonym_list.each_with_index.map do |mapping, index|
         Synonym.new(:id => index, :collection => self, :mapping => mapping, :persisted => true)
       end
     end

data/lib/lucid_works/collection/synonym.rb

@@ -4,7 +4,9 @@ module LucidWorks
     
     class Synonym
       include ActiveModel::Validations
-      extend  ActiveModel::Naming
+      include ActiveModel::Conversion
+      extend ActiveModel::Naming
+      extend SimpleNaming
       
       attr_reader :id, :collection, :persisted
       attr_accessor :mapping
@@ -31,6 +33,7 @@ module LucidWorks
           settings.synonym_list[id] = mapping
         else
           settings.synonym_list << mapping
+          @id = settings.synonym_list.length - 1
         end
         settings.save
         @persisted = true

data/lib/lucid_works/simple_naming.rb

@@ -0,0 +1,13 @@
+module LucidWorks
+  module SimpleNaming
+    def model_name
+      super.tap do |name|
+        name.instance_eval do
+          def singular; ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).tr('/', '_').freeze; end
+          def plural; singular.pluralize.freeze; end
+          def collection; ActiveSupport::Inflector.tableize(ActiveSupport::Inflector.demodulize(self)).freeze; end
+        end
+      end
+    end
+  end
+end

data/lib/lucid_works/version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 end

data/spec/lib/lucid_works/collection/synonym_spec.rb

@@ -12,6 +12,22 @@ describe LucidWorks::Collection::Synonym do
   end
   alias :reload_collection :load_collection
   
+  describe "naming support" do
+    it "demodulizes names" do
+      LucidWorks::Collection::Synonym.model_name.singular.should == "synonym"
+      LucidWorks::Collection::Synonym.model_name.plural.should == "synonyms"
+      LucidWorks::Collection::Synonym.model_name.collection.should == "synonyms"
+    end
+  end
+  
+  describe "conversion support" do
+    it "can be converted to a key" do
+      synonym = LucidWorks::Collection::Synonym.new(:collection => @collection, :mapping => "car, auto")
+      synonym.save
+      synonym.to_key.should == [8]
+    end
+  end
+  
   describe "validations" do
     it "requires a mapping" do
       synonym = LucidWorks::Collection::Synonym.new(:mapping => "")
@@ -31,7 +47,7 @@ describe LucidWorks::Collection::Synonym do
       synonym.errors[:mapping].should == ["must be a comma-separated list"]
     end
   end
-  
+    
   describe :save do
     context "when valid" do
       subject { LucidWorks::Collection::Synonym.new(:collection => @collection, :mapping => "car, auto") }
@@ -49,6 +65,11 @@ describe LucidWorks::Collection::Synonym do
         subject.save
         subject.should be_persisted
       end
+      
+      it "gets an id" do
+        subject.save
+        subject.id.should == 8
+      end
     end
     
     context "when invalid" do

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors: 
 - Sam Pierson
@@ -132,6 +132,7 @@ files:
 - lib/lucid_works/patch_time.rb
 - lib/lucid_works/schema.rb
 - lib/lucid_works/server.rb
+- lib/lucid_works/simple_naming.rb
 - lib/lucid_works/utils.rb
 - lib/lucid_works/version.rb
 - lucid_works.gemspec