lucid_works 0.6.7 → 0.6.8

data/lib/lucid_works/base.rb

@@ -49,6 +49,16 @@ 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.
       # Alternatively, you may define a schema for your object.

data/lib/lucid_works/datasource/schedule.rb

@@ -105,9 +105,11 @@ module LucidWorks
       #
       def schedule=(all_attributes)
         # convert to format accepted by Time.advance
-        all_attributes['start'].to_options!
-        all_attributes['start'].each{|k,v| all_attributes['start'][k]=v.to_i}
-
+        if all_attributes['start']
+          all_attributes['start'].to_options!
+          all_attributes['start'].each{|k,v| all_attributes['start'][k]=v.to_i}
+        end
+        
         self.active = all_attributes['active']  if all_attributes.keys.include?('active')
         
         self.frequency = all_attributes['frequency']
@@ -161,12 +163,21 @@ module LucidWorks
       # convenience method for detecting whether schedule can be represented in simple format
       # or should be described as custom (meaning it is beyond the capabilities of the convenience methods)
       #
-        def custom?
-          return true if self.frequency == 'custom'
-          return false unless self.start_time
-          return true if self.start_is_more_than_one_period_in_the_future?
-          return false
+      def custom?
+        return true if self.frequency == 'custom'
+        return false unless self.start_time
+        return true if self.start_is_more_than_one_period_in_the_future?
+        return false
+      end
+
+      #
+      # convenience method for setting defaults in a UI that make sense for a user
+      #
+      def ui_appropriate_defaults!
+        if self.start_time.blank? || self.period == 0
+          self.active = true
         end
+      end
     end
   end
 end

data/lib/lucid_works/version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/spec/lib/lucid_works/base_spec.rb

@@ -35,6 +35,42 @@ describe LucidWorks::Base do
     end
   end
 
+  describe "naming support" do
+    context "for a namespaced model" do
+      class LucidWorks::NamespacedModel < LucidWorks::Base
+      end
+      
+      it "demodulizes the model's singular name" do
+        LucidWorks::NamespacedModel.model_name.singular.should == "namespaced_model"
+      end
+
+      it "demodulizes the model's plural name" do
+        LucidWorks::NamespacedModel.model_name.plural.should == "namespaced_models"
+      end
+
+      it "demodulizes the model's collection name" do
+        LucidWorks::NamespacedModel.model_name.collection.should == "namespaced_models"
+      end
+    end
+
+    context "for a top-level model" do
+      class TopLevelModel < LucidWorks::Base
+      end
+      
+      it "returns the model's singular name" do
+        TopLevelModel.model_name.singular.should == "top_level_model"
+      end
+
+      it "returns the model's plural name" do
+        TopLevelModel.model_name.plural.should == "top_level_models"
+      end
+
+      it "returns the model's collection name" do
+        TopLevelModel.model_name.plural.should == "top_level_models"
+      end
+    end
+  end
+  
   describe "class methods" do
 
     describe ".schema" do

data/spec/lib/lucid_works/datasource/schedule_spec.rb

@@ -345,4 +345,26 @@ describe LucidWorks::Datasource::Schedule do
       @schedule.should_not be_custom
     end
   end
+  
+  describe '#ui_appropriate_defaults!' do
+    it "should set active to true if start_time is defaulted" do
+      @schedule.start_time = nil
+      @schedule.period = 1.hours.seconds
+      @schedule.active = false
+      
+      @schedule.ui_appropriate_defaults!
+      
+      @schedule.active.should == true
+    end
+
+    it "should set active to true if period is defaulted" do
+      @schedule.start_time = Time.now
+      @schedule.period = 0
+      @schedule.active = false
+      
+      @schedule.ui_appropriate_defaults!
+      
+      @schedule.active.should == true
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - Sam Pierson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -04:00
+date: 2011-05-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency