xteam_schedule 0.0.3 → 0.0.4

data/README.md

@@ -21,8 +21,6 @@ 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

data/lib/xteam_schedule.rb

@@ -3,6 +3,13 @@ require 'active_record'
 require 'sqlite3'
 require 'xteam_schedule/core'
 
+require 'xteam_schedule/facilitation/schema'
+require 'xteam_schedule/facilitation/base'
+require 'xteam_schedule/facilitation/parser'
+require 'xteam_schedule/facilitation/composer'
+require 'xteam_schedule/facilitation/io'
+require 'xteam_schedule/facilitation/lmc_patch'
+
 require 'xteam_schedule/models/assignment'
 require 'xteam_schedule/models/assignment_group'
 require 'xteam_schedule/models/interface'
@@ -13,10 +20,4 @@ require 'xteam_schedule/models/weekly_working_schedule'
 require 'xteam_schedule/models/working_day'
 require 'xteam_schedule/models/working_time'
 
-require 'xteam_schedule/facilitation/composer'
-require 'xteam_schedule/facilitation/base'
-require 'xteam_schedule/facilitation/io'
-require 'xteam_schedule/facilitation/parser'
-
-XTeamSchedule::Base.connect
 XTeamSchedule::Base.build_schema

data/lib/xteam_schedule/core.rb

@@ -22,6 +22,10 @@ class XTeamSchedule
     @schedule.send(*args)
   end
   
+  def self.inspect
+    XTeamSchedule::Schedule.inspect
+  end
+  
   def inspect
     stats = [:resource_groups, :resources, :assignment_groups, :assignments, :working_times].map { |s| [s, send(s).count] }
     stats_string = stats.map { |s| "#{s.first}(#{s.second})" }.join(', ')

data/lib/xteam_schedule/facilitation/base.rb

@@ -1,22 +1,16 @@
-class XTeamSchedule::Base
-  
-  def self.connect
-    ActiveRecord::Base.establish_connection(
-      :adapter => 'sqlite3',
-      :database => ':memory:'
-    )
-  end
+class XTeamSchedule::Base < ActiveRecord::Base
+  self.abstract_class = true
+  establish_connection(:adapter => 'sqlite3', :database => ':memory:')
   
   def self.build_schema
-    ActiveRecord::Schema.verbose = false
-    ActiveRecord::Schema.define do
+    XTeamSchedule::Schema.define do
       
-      create_table :schedules do |table|
+      create_table :schedules, :force => true do |table|
         table.column :begin_date, :date, :default => 10.years.ago.to_date
         table.column :end_date, :date, :default => 10.years.from_now.to_date
       end
       
-      create_table :interfaces do |table|
+      create_table :interfaces, :force => true do |table|
         table.column :schedule_id, :integer
         table.column :display_assignments_name, :boolean, :default => true
         table.column :display_resources_name, :boolean, :default => false
@@ -28,11 +22,11 @@ class XTeamSchedule::Base
         table.column :time_granularity, :integer, :default => XTeamSchedule::Interface::TIME_GRANULARITIES[:month]
       end
       
-      create_table :weekly_working_schedules do |table|
+      create_table :weekly_working_schedules, :force => true do |table|
         table.column :schedule_id, :integer
       end
       
-      create_table :working_days do |table|
+      create_table :working_days, :force => true do |table|
         table.column :weekly_working_schedule_id, :integer
         table.column :name, :string
         table.column :day_begin, :string
@@ -41,13 +35,13 @@ class XTeamSchedule::Base
         table.column :break_end, :string
       end
       
-      create_table :resource_groups do |table|
+      create_table :resource_groups, :force => true do |table|
         table.column :schedule_id, :integer
         table.column :expanded_in_library, :boolean, :default => true
         table.column :name, :string
       end
       
-      create_table :resources do |table|
+      create_table :resources, :force => true do |table|
         table.column :resource_group_id, :integer
         table.column :displayed_in_planning, :boolean, :default => true
         table.column :email, :string
@@ -57,27 +51,25 @@ class XTeamSchedule::Base
         table.column :phone, :string
       end
       
-      create_table :assignment_groups do |table|
+      create_table :assignment_groups, :force => true do |table|
         table.column :schedule_id, :integer
         table.column :expanded_in_library, :boolean, :default => true
         table.column :name, :string
       end
       
-      create_table :assignments do |table|
+      create_table :assignments, :force => true do |table|
         table.column :assignment_group_id, :integer
         table.column :name, :string
         table.column :colour, :string
       end
       
-      create_table :working_times do |table|
+      create_table :working_times, :force => true do |table|
         table.column :resource_id, :integer
         table.column :assignment_id, :integer
         table.column :begin_date, :date
         table.column :duration, :integer
         table.column :notes, :string
       end
-      
     end
   end
-  
 end

data/lib/xteam_schedule/facilitation/lmc_patch.rb

@@ -0,0 +1,22 @@
+# http://tinyurl.com/73s9drr
+module ActiveSupport
+  module Dependencies
+    extend self
+    
+    #def load_missing_constant(from_mod, const_name)
+    
+    def forgiving_load_missing_constant( from_mod, const_name )
+      begin
+        old_load_missing_constant(from_mod, const_name)
+      rescue ArgumentError => arg_err
+        if arg_err.message == "#{from_mod} is not missing constant #{const_name}!"
+          return from_mod.const_get(const_name)
+        else
+          raise
+        end
+      end
+    end
+    alias :old_load_missing_constant :load_missing_constant
+    alias :load_missing_constant :forgiving_load_missing_constant
+  end
+end

data/lib/xteam_schedule/facilitation/schema.rb

@@ -0,0 +1,11 @@
+class XTeamSchedule::Schema
+  
+  def self.define(&block)
+    instance_eval(&block)
+  end
+  
+  def self.method_missing(method, *args, &block)
+    XTeamSchedule::Base.connection.send(method, *args, &block)
+  end
+  
+end

data/lib/xteam_schedule/models/assignment.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::Assignment < ActiveRecord::Base
+class XTeamSchedule::Assignment < XTeamSchedule::Base
   belongs_to :assignment_group
   has_many :working_times, :dependent => :destroy
   delegate :schedule, :to => :assignment_group

data/lib/xteam_schedule/models/assignment_group.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::AssignmentGroup < ActiveRecord::Base
+class XTeamSchedule::AssignmentGroup < XTeamSchedule::Base
   belongs_to :schedule
   has_many :assignments, :dependent => :destroy
 

data/lib/xteam_schedule/models/interface.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::Interface < ActiveRecord::Base
+class XTeamSchedule::Interface < XTeamSchedule::Base
   belongs_to :schedule
   
   alias_attribute :display_assignment_names, :display_assignments_name

data/lib/xteam_schedule/models/resource.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::Resource < ActiveRecord::Base
+class XTeamSchedule::Resource < XTeamSchedule::Base
   belongs_to :resource_group
   has_many :working_times, :dependent => :destroy
   delegate :schedule, :to => :resource_group

data/lib/xteam_schedule/models/resource_group.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::ResourceGroup < ActiveRecord::Base
+class XTeamSchedule::ResourceGroup < XTeamSchedule::Base
   belongs_to :schedule
   has_many :resources, :dependent => :destroy
   

data/lib/xteam_schedule/models/schedule.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::Schedule < ActiveRecord::Base
+class XTeamSchedule::Schedule < XTeamSchedule::Base
   has_many :resource_groups, :dependent => :destroy
   has_many :resources, :through => :resource_groups
   has_many :assignment_groups, :dependent => :destroy
@@ -35,7 +35,7 @@ private
   end
   
   def set_default_weekly_working_schedule
-    self.weekly_working_schedule = XTeamSchedule::WeeklyWorkingSchedule.new
+    self.weekly_working_schedule ||= XTeamSchedule::WeeklyWorkingSchedule.new
   end
   
 end

data/lib/xteam_schedule/models/weekly_working_schedule.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::WeeklyWorkingSchedule < ActiveRecord::Base
+class XTeamSchedule::WeeklyWorkingSchedule < XTeamSchedule::Base
   belongs_to :schedule
   has_many :working_days, :dependent => :destroy
   

data/lib/xteam_schedule/models/working_day.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::WorkingDay < ActiveRecord::Base
+class XTeamSchedule::WorkingDay < XTeamSchedule::Base
   belongs_to :weekly_working_schedule
   delegate :schedule, :to => :weekly_working_schedule
   

data/lib/xteam_schedule/models/working_time.rb

@@ -1,4 +1,4 @@
-class XTeamSchedule::WorkingTime < ActiveRecord::Base
+class XTeamSchedule::WorkingTime < XTeamSchedule::Base
   belongs_to :resource
   belongs_to :assignment
   delegate :resource_group, :to => :resource

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xteam_schedule
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Christopher Patuzzo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-15 00:00:00 Z
+date: 2012-03-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plist
@@ -91,20 +91,6 @@ dependencies:
         version: 2.2.0
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
 description: Full control over schedules for use with adnX's xTeam software
 email: chris.patuzzo@gmail.com
 executables: []
@@ -119,7 +105,9 @@ files:
 - lib/xteam_schedule/facilitation/base.rb
 - lib/xteam_schedule/facilitation/composer.rb
 - lib/xteam_schedule/facilitation/io.rb
+- lib/xteam_schedule/facilitation/lmc_patch.rb
 - lib/xteam_schedule/facilitation/parser.rb
+- lib/xteam_schedule/facilitation/schema.rb
 - lib/xteam_schedule/models/assignment.rb
 - lib/xteam_schedule/models/assignment_group.rb
 - lib/xteam_schedule/models/interface.rb