xteam_schedule 0.0.1 → 0.0.3

data/README.md

@@ -21,6 +21,8 @@ I am in no way associated with adnX. I work for an agile development company tha
 
 It is not required that you have [xTeam](http://www.adnx.com/i/apps/xteam4mac) installed. However, you will not be able to visualise your schedules otherwise.
 
+At present, the gem is incompatible with existing database connections (rails, for example). This will change soon.
+
 **Install the gem:**
 
 ```ruby
@@ -53,7 +55,7 @@ XTeamSchedule.new('path/to/file.xtps')
 => #<XTeamSchedule resoruce_groups(9), resources(42), assignment_groups(14), assignments(118), working_times(79)>
 ```
 
-A schedule has many resource groups and assignment groups. It also has many resources and assignments through resource groups and assignment groups respectively. Finally, a schedule has many working times through either resource groups then resources or assignment groups then assignments.
+A schedule has many resource groups and assignment groups. It also has many resources and assignments through resource groups and assignment groups respectively. Finally, a schedule has many working times through either resource groups then resources or assignment groups then assignments. Wherever possible, naming has been chosen to match xTeam, i.e. 'resource' instead of 'employee'.
 
 ```ruby
 schedule = XTeamSchedule.new('path/to/file.xtps')
@@ -65,7 +67,13 @@ assignments       = schedule.assignments
 working_times     = schedule.working_times
 ```
 
-There are numerous other models, for example a schedule has one 'interface' which contains various display settings. These are explained in detail below. It is also possible to convert a schedule to/from a hash. After serialisation, this could easily be written to a database.
+There are numerous other models, for example a schedule has one 'interface' which contains various display settings. These are explained in detail below. To output a schedule that can be read by xTeam, use the 'write' method:
+
+```ruby
+schedule.write('path/to/file.xtps')
+```
+
+ It is also possible to convert a schedule to/from a hash. After serialisation, this could easily be written to a database.
 
 ```ruby
 hash     = schedule.hash
@@ -295,7 +303,7 @@ wednesday.update_attribute(:break_begin, nil)
 ```
 
 **Defaults:**
-The default weekly working schedule is identical to the same as the one set up above. i.e. 9am-5pm Mon-Fri, with lunch from 12pm-1pm.
+The default weekly working schedule is identical to the same as the one set up above (except wednesday lunch). i.e. 9am-5pm Mon-Fri, with lunch from 12pm-1pm.
 
 ## Under Development
 

data/lib/xteam_schedule/facilitation/{db.rb → base.rb}

@@ -1,4 +1,4 @@
-class XTeamSchedule::DB
+class XTeamSchedule::Base
   
   def self.connect
     ActiveRecord::Base.establish_connection(

data/lib/xteam_schedule/facilitation/parser.rb

@@ -26,16 +26,17 @@ class XTeamSchedule::Parser
 private
   
   def parse_resource_groups!
-    hash['resource groups'].try(:each) do |rg|
+    hash['resource groups'].each do |rg|
       schedule.resource_groups.create!(
         :name => rg['name'],
         :expanded_in_library => rg['expanded in library']
       )
     end
+  rescue
   end
   
   def parse_resources!
-    hash['resources'].try(:each) do |r|
+    hash['resources'].each do |r|
       resource_group = schedule.resource_groups.find_by_name(r['group'])
       if resource_group
         image = r['image'].class == StringIO ? r['image'].read : ''
@@ -49,19 +50,21 @@ private
         )
       end
     end
+  rescue
   end
   
   def parse_assignment_groups!
-    hash['task categories'].try(:each) do |ag|
+    hash['task categories'].each do |ag|
       schedule.assignment_groups.create!(
         :name => ag['name'],
         :expanded_in_library => ag['expanded in library']
       )
     end
+  rescue
   end
   
   def parse_assignments!
-    hash['tasks'].try(:each) do |a|
+    hash['tasks'].each do |a|
       assignment_group = schedule.assignment_groups.find_by_name(a['category'])
       if assignment_group
         assignment_group.assignments.create!(
@@ -70,6 +73,7 @@ private
         )
       end
     end
+  rescue
   end
   
   def parse_working_times!

data/lib/xteam_schedule/models/assignment.rb

@@ -8,8 +8,14 @@ class XTeamSchedule::Assignment < ActiveRecord::Base
   validates_presence_of :colour
   validate :rgb_colour
   
-  serialize :colour, Hash
-  after_initialize :set_default_colour
+  ActiveSupport::Deprecation.silence do
+    after_initialize :set_default_colour
+    def after_initialize
+      set_default_colour
+    end
+  end
+  
+  serialize :colour
   before_save :symbolize_colour!
   after_validation :float_colour_values!
 
@@ -29,7 +35,7 @@ private
   end
   
   def set_default_colour
-    self.colour = { :red => 0.5, :green => 0.5, :blue => 0.5 } if colour.empty?
+    self.colour = { :red => 0.5, :green => 0.5, :blue => 0.5 } unless colour.present?
   end
   
   def symbolize_colour!

data/lib/xteam_schedule/models/schedule.rb

@@ -3,14 +3,30 @@ class XTeamSchedule::Schedule < ActiveRecord::Base
   has_many :resources, :through => :resource_groups
   has_many :assignment_groups, :dependent => :destroy
   has_many :assignments, :through => :assignment_groups
-  has_many :working_times, :through => :resources
   has_many :working_days, :through => :weekly_working_schedule
   
   has_one :interface
-  after_initialize :set_default_interface
-  
   has_one :weekly_working_schedule
-  after_initialize :set_default_weekly_working_schedule
+  
+  ActiveSupport::Deprecation.silence do
+    after_initialize :set_default_interface
+    after_initialize :set_default_weekly_working_schedule
+    def after_initialize
+      set_default_interface
+      set_default_weekly_working_schedule
+    end
+  end
+  
+  def working_times
+    ids = XTeamSchedule::WorkingTime.find_by_sql([
+    "select distinct * from working_times as wt
+     join resources r on wt.resource_id = r.id
+     join resource_groups rg on r.resource_group_id = rg.id
+     where rg.schedule_id = ?", id
+    ]).map(&:id)
+    
+    XTeamSchedule::WorkingTime.scoped(:conditions => { :id => ids })
+  end
   
 private
   

data/lib/xteam_schedule/models/weekly_working_schedule.rb

@@ -2,7 +2,12 @@ class XTeamSchedule::WeeklyWorkingSchedule < ActiveRecord::Base
   belongs_to :schedule
   has_many :working_days, :dependent => :destroy
   
-  after_initialize :set_default_working_days
+  ActiveSupport::Deprecation.silence do
+    after_initialize :set_default_working_days
+    def after_initialize
+      set_default_working_days
+    end
+  end
   
 private
   

data/lib/xteam_schedule.rb

@@ -14,9 +14,9 @@ require 'xteam_schedule/models/working_day'
 require 'xteam_schedule/models/working_time'
 
 require 'xteam_schedule/facilitation/composer'
-require 'xteam_schedule/facilitation/db'
+require 'xteam_schedule/facilitation/base'
 require 'xteam_schedule/facilitation/io'
 require 'xteam_schedule/facilitation/parser'
 
-XTeamSchedule::DB.connect
-XTeamSchedule::DB.build_schema
+XTeamSchedule::Base.connect
+XTeamSchedule::Base.build_schema

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xteam_schedule
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Christopher Patuzzo
@@ -41,8 +41,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 2
+        - 2
+        version: 2.2.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -79,12 +81,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 2
+        - 2
         - 0
-        version: "0"
+        version: 2.2.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -112,8 +116,8 @@ extra_rdoc_files: []
 files: 
 - README.md
 - lib/xteam_schedule/core.rb
+- lib/xteam_schedule/facilitation/base.rb
 - lib/xteam_schedule/facilitation/composer.rb
-- lib/xteam_schedule/facilitation/db.rb
 - lib/xteam_schedule/facilitation/io.rb
 - lib/xteam_schedule/facilitation/parser.rb
 - lib/xteam_schedule/models/assignment.rb