acts_as_working_days 0.0.4 → 0.0.6

data/README.rdoc

@@ -4,33 +4,81 @@ acts_as_working_days is a Rails plugin to add working days on models
 
 == Usage
 
- class Company < ActiveRecord::Base
-  
-   acts_as_working_days
-
- end
- 
- #Sample test code 
- def test_working_day
-
-   kwik_e_mart = Company.new(:name => 'Kwik-E-Mart')
-
-   #1 is Monday - Apu Kwik-E-Mart is only opened on Mondays, start 8h30, end 18h45
-   kwik_e_mart.put_working_day(:week_day => 1, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+	#app/models/company.rb
+	class Company < ActiveRecord::Base
 
-   #Save model and working day
-   kwik_e_mart.save
+		acts_as_working_days
 
-   #0 is Sunday - 12h45 is closed 
-   assert_equal false, kwik_e_mart.working_day?(:week_day => 0, :hour => 12, :min => 0)
-
-   #1 is Monday - 21h00 is closed 
-   assert_equal false, kwik_e_mart.working_day?(:week_day => 1, :hour => 21)
-
-   #1 is Monday - 12h15 is opened 
-   assert_equal true, kwik_e_mart.working_day?(:week_day => 1, :hour => 12, :min => 15)
-
- end
+	end
+ 
+	#Sample test code 
+	def test_working_day
+
+		kwik_e_mart = Company.new(:name => 'Kwik-E-Mart')
+
+		#1 is Monday, Apu Kwik-E-Mart is only opened on Mondays, start 8h30, end 18h45
+		kwik_e_mart.working_days.build(:week_day => 1, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+
+		#Save model and working day
+		kwik_e_mart.save
+
+		#0 is Sunday, 12h45 is closed 
+		assert_equal false, kwik_e_mart.working_day?(:week_day => 0, :hour => 12, :min => 0)
+
+		#1 is Monday, 21h00 is closed 
+		assert_equal false, kwik_e_mart.working_day?(:week_day => 1, :hour => 21)
+
+		#1 is Monday, 12h15 is opened 
+		assert_equal true, kwik_e_mart.working_day?(:week_day => 1, :hour => 12, :min => 15)
+
+	end
+
+	#app/views/company/new.html.erb
+	<% form_for @company do |f| %>
+		<%= f.error_messages %>
+		<h2>Company fields</h2>
+		<p>
+			<%= f.label :name, 'Company name' %><br/>
+			<%= f.text_field :name %>
+		</p>
+		<h2>Workings days</h2>
+		<table id="table-working-days">
+			<thead>
+				<tr>
+					<th>Day</th>
+					<th>Open</th>
+					<th>Close</th>
+				</tr>
+			</thead>
+			<tbody>
+				<% f.fields_for :working_days, @address.working_days_defaults do | working_day_form | %>
+					<tr>
+						<!-- I18n week_day.day_0...day_6, Sunday..Saturday -->
+						<td><%=  t "week_day.day_#{working_day_form.object.week_day}" %></td>
+						<td>
+							<%= working_day_form.hidden_field :week_day %>
+							<%= working_day_form.select :start_hour, 0..23, {}, {:class => 'select'}  %>
+							<%= working_day_form.select :start_min, 0..59, {}, {:class => 'select'}  %>
+						</td>
+						<td>
+							<%= working_day_form.select :end_hour, 0..23, {}, {:class => 'select'}  %>
+							<%= working_day_form.select :end_min, 0..59, {}, {:class => 'select'}  %>
+						</td>
+					</tr>
+				<% end %>
+			</tbody>
+		<table>
+	<% end %>
+	
+	#config/locales/en.yml
+	week_day:
+	  day_0: Sunday
+	  day_1: Monday
+	  day_2: Tuesday
+	  day_3: Wednesday
+	  day_4: Thursday
+	  day_5: Friday
+	  day_6: Saturday
   
 
 == Installation

data/acts_as_working_days.gemspec

@@ -9,15 +9,16 @@ PKG_FILES = FileList[
   'lib/**/*',
   'rails/**/*',
   'tasks/**/*',
-  'test/**/*'
+  'test/**/*',
+  'app/**/*'
 ]
  
 spec = Gem::Specification.new do |s|
   s.name = "acts_as_working_days"
-  s.version = "0.0.4"
+  s.version = "0.0.6"
   s.author = "Pablo Cantero"
   s.email = "pablo@pablocantero.com"
-  s.homepage = "http://pablocantero.com/"
+  s.homepage = "https://github.com/phstc/acts_as_working_days"
   s.platform = Gem::Platform::RUBY
   s.summary = "acts_as_working_days is a Rails plugin to add working days on models"
   s.files = PKG_FILES.to_a

data/app/models/working_day.rb

@@ -0,0 +1,27 @@
+class WorkingDay < ActiveRecord::Base
+  
+  validates_inclusion_of :week_day, :in => 0..6
+  validates_inclusion_of :start_hour, :in => 0..23
+  validates_inclusion_of :start_min, :in => 0..59
+  validates_inclusion_of :end_hour, :in => 0..23
+  validates_inclusion_of :end_min, :in => 0..59
+  
+  validate :end_bigger_than_start
+  
+  belongs_to :workable, :polymorphic => true
+  
+  validates_associated :workable
+  
+  validates_uniqueness_of :week_day, :scope => [:workable_id, :workable_type] 
+  
+  private
+  
+  def end_bigger_than_start
+    if end_hour < start_hour
+      errors.add :end_hour, "can't be lower than start_hour"
+    elsif end_hour == start_hour && end_min < start_min
+      errors.add :end_min, "can't be lower than start_min"
+    end
+  end
+  
+end

data/generators/acts_as_working_days_migration/templates/migration.rb

@@ -4,10 +4,10 @@ class ActsAsWorkingDaysMigration < ActiveRecord::Migration
     create_table :working_days, :force => true do |t|
       #Date time columns
       t.integer :week_day
-      t.integer :start_hour
-      t.integer :start_min
-      t.integer :end_hour
-      t.integer :end_min
+      t.integer :start_hour, :default => 0
+      t.integer :start_min, :default => 0
+      t.integer :end_hour, :default => 23
+      t.integer :end_min, :default => 59
       #Polymorphic columns
       t.integer :workable_id
       t.string :workable_type

data/lib/acts_as_working_days.rb

@@ -8,6 +8,7 @@ module ActsAsWorkingDays
     def acts_as_working_days
       # adding relationship to self class
       has_many :working_days, :as => :workable
+      accepts_nested_attributes_for :working_days, :allow_destroy => true
       send :include, InstanceMethods
     end
   end
@@ -28,20 +29,29 @@ module ActsAsWorkingDays
       return !result.empty?
     end
     
-    def put_working_day(params = {:week_day => Time.now.wday, :start_hour => 0, :start_min => 0, :end_hour => 23, :end_min => 59})
-      working_day = nil
-      working_days.each do | wd |
-        if wd.week_day == params[:week_day]
-          working_day = wd
-          break
-        end
-      end
-      if working_day.nil?
-        working_days.build(params)
-      else
-        working_day.update_attributes(params)
+    def working_days_defaults
+      defaults = []
+      7.times do | wday |
+        defaults << (working_days.find_by_week_day(wday, :order => 'week_day ASC') || WorkingDay.new(:week_day => wday))
       end
+      return defaults
     end
+    
+    # def put_working_day(params = {:week_day => Time.now.wday, :start_hour => 0, :start_min => 0, :end_hour => 23, :end_min => 59})
+    #   working_day = nil
+    #   working_days.each do | wd |
+    #     if wd.week_day == params[:week_day]
+    #       working_day = wd
+    #       break
+    #     end
+    #   end
+    #   if working_day.nil?
+    #     working_days.build(params)
+    #   else
+    #     working_day.update_attributes(params)
+    #   end
+    # end
+    
   end
 end
 

data/lib/generators/acts_as_working_days/migration/templates/active_record/migration.rb

@@ -4,10 +4,10 @@ class ActsAsWorkingDaysMigration < ActiveRecord::Migration
     create_table :working_days, :force => true do |t|
       #Date time columns
       t.integer :week_day
-      t.integer :start_hour
-      t.integer :start_min
-      t.integer :end_hour
-      t.integer :end_min
+      t.integer :start_hour, :default => 0
+      t.integer :start_min, :default => 0
+      t.integer :end_hour, :default => 23
+      t.integer :end_min, :default => 59
       #Polymorphic columns
       t.integer :workable_id
       t.string :workable_type

data/test/acts_as_working_days_test.rb

@@ -18,55 +18,70 @@ class ActsAsWorkingDaysTest < Test::Unit::TestCase
     assert_equal [], Company.all
   end
   
-  def test_put_working_day
-    the_leftorium = Company.new(:name => 'The Leftorium')
-    assert_equal [], the_leftorium.working_days
-    working_day = the_leftorium.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
-    the_leftorium.save
-    assert_equal [working_day], the_leftorium.working_days
-    assert_equal 0, working_day.week_day
-    assert_equal 8, working_day.start_hour
-    assert_equal 30, working_day.start_min
-    assert_equal 18, working_day.end_hour
-    assert_equal 45, working_day.end_min
-  end
+  # def test_put_working_day
+  #   the_leftorium = Company.new(:name => 'The Leftorium')
+  #   assert_equal [], the_leftorium.working_days
+  #   working_day = the_leftorium.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+  #   the_leftorium.save
+  #   assert_equal [working_day], the_leftorium.working_days
+  #   assert_equal 0, working_day.week_day
+  #   assert_equal 8, working_day.start_hour
+  #   assert_equal 30, working_day.start_min
+  #   assert_equal 18, working_day.end_hour
+  #   assert_equal 45, working_day.end_min
+  # end
   
-  def test_put_updating_a_working_day
-    moes_tavern = Company.new(:name => 'Moes Tavern')
-    working_day = moes_tavern.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
-    moes_tavern.save
-    #Updating working day
-    moes_tavern.put_working_day(:week_day => 0, :start_hour => 10, :start_min => 13, :end_hour => 19, :end_min => 23)
-    moes_tavern.save
-    working_day = moes_tavern.working_days.first
-    assert_equal 0, working_day.week_day
-    assert_equal 10, working_day.start_hour
-    assert_equal 13, working_day.start_min
-    assert_equal 19, working_day.end_hour
-    assert_equal 23, working_day.end_min
-  end
+  # def test_put_updating_a_working_day
+  #   moes_tavern = Company.new(:name => 'Moes Tavern')
+  #   working_day = moes_tavern.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+  #   moes_tavern.save
+  #   #Updating working day
+  #   moes_tavern.put_working_day(:week_day => 0, :start_hour => 10, :start_min => 13, :end_hour => 19, :end_min => 23)
+  #   moes_tavern.save
+  #   working_day = moes_tavern.working_days.first
+  #   assert_equal 0, working_day.week_day
+  #   assert_equal 10, working_day.start_hour
+  #   assert_equal 13, working_day.start_min
+  #   assert_equal 19, working_day.end_hour
+  #   assert_equal 23, working_day.end_min
+  # end
   
   def test_true_working_day
     moes_tavern = Company.new(:name => 'Moes Tavern')
-    moes_tavern.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+    #moes_tavern.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+    moes_tavern.working_days.build(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
     moes_tavern.save
     assert_equal true, moes_tavern.working_day?(:week_day => 0, :hour => 12, :minute => 0)
   end
   
-  def test_uniqueness_week_day_per_model
-    nuclear_power_plant = Company.new(:name => 'Springfield Nuclear Power Plant')
-    working_day = nuclear_power_plant.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
-    nuclear_power_plant.put_working_day(:week_day => 0, :start_hour => 9, :start_min => 15, :end_hour => 19, :end_min => 30)
-    nuclear_power_plant.save
-    assert_equal [working_day], nuclear_power_plant.working_days
-    nuclear_power_plant.put_working_day(:week_day => 0, :start_hour => 6, :start_min => 0, :end_hour => 16, :end_min => 15)
-    nuclear_power_plant.save
-    assert_equal [working_day], nuclear_power_plant.working_days
+  # def test_uniqueness_week_day_per_model
+  #   nuclear_power_plant = Company.new(:name => 'Springfield Nuclear Power Plant')
+  #   working_day = nuclear_power_plant.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+  #   nuclear_power_plant.put_working_day(:week_day => 0, :start_hour => 9, :start_min => 15, :end_hour => 19, :end_min => 30)
+  #   nuclear_power_plant.save
+  #   assert_equal [working_day], nuclear_power_plant.working_days
+  #   nuclear_power_plant.put_working_day(:week_day => 0, :start_hour => 6, :start_min => 0, :end_hour => 16, :end_min => 15)
+  #   nuclear_power_plant.save
+  #   assert_equal [working_day], nuclear_power_plant.working_days
+  # end
+  
+  def test_working_days_defaults
+    kwik_e_mart = Company.new(:name => 'Kwik-E-Mart')
+    assert_equal 7, kwik_e_mart.working_days_defaults.size
+    assert_equal nil, kwik_e_mart.working_days_defaults.first.id
+    #working_day = kwik_e_mart.put_working_day(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+    working_day = kwik_e_mart.working_days.build(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+    kwik_e_mart.save
+    assert_equal working_day, kwik_e_mart.working_days_defaults.first
+    7.times do | wday |
+      assert_equal wday, kwik_e_mart.working_days_defaults[wday].week_day
+    end
   end
    
   def test_false_working_day
     kwik_e_mart = Company.new(:name => 'Kwik-E-Mart')
-    kwik_e_mart.put_working_day(:week_day => 1, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+    #kwik_e_mart.put_working_day(:week_day => 1, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
+    kwik_e_mart.working_days.build(:week_day => 1, :start_hour => 8, :start_min => 30, :end_hour => 18, :end_min => 45)
     kwik_e_mart.save
     assert_equal false, kwik_e_mart.working_day?(:week_day => 0, :hour => 12, :min => 0)
     assert_equal false, kwik_e_mart.working_day?(:week_day => 1, :hour => 21)

data/test/working_day_test.rb

@@ -6,4 +6,19 @@ class WorkingDayTest < Test::Unit::TestCase
   def test_working_day
     assert_kind_of WorkingDay, WorkingDay.new
   end
+  
+  def test_end_hour_lower_than_start_hour
+    working_day = WorkingDay.new(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 7, :end_min => 45)
+    assert !working_day.valid?
+    working_day.end_hour = 10
+    assert working_day.valid?
+  end
+  
+  def test_end_min_lower_than_start_min
+    working_day = WorkingDay.new(:week_day => 0, :start_hour => 8, :start_min => 30, :end_hour => 8, :end_min => 15)
+    assert !working_day.valid?
+    working_day.end_min = 45
+    assert working_day.valid?
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_working_days
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Pablo Cantero
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -02:00
+date: 2010-11-20 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,8 @@ extra_rdoc_files:
 files: 
 - acts_as_working_days-0.0.1.gem
 - acts_as_working_days-0.0.3.gem
+- acts_as_working_days-0.0.4.gem
+- acts_as_working_days-0.0.5.gem
 - acts_as_working_days.gemspec
 - init.rb
 - install.rb
@@ -49,8 +51,9 @@ files:
 - test/schema.rb
 - test/test_helper.rb
 - test/working_day_test.rb
+- app/models/working_day.rb
 has_rdoc: true
-homepage: http://pablocantero.com/
+homepage: https://github.com/phstc/acts_as_working_days
 licenses: []
 
 post_install_message: