osm 0.0.17 → 0.0.18

data/spec/osm/event_spec.rb

@@ -23,10 +23,11 @@ describe "Event" do
     event.section_id.should == 2
     event.name.should == 'Event name'
     event.start.should == DateTime.new(2001, 1, 2, 12, 0, 0)
-    event.end.should == nil
+    event.finish.should == nil
     event.cost.should == 'Free'
     event.location.should == 'Somewhere'
     event.notes.should == 'None'
+    event.valid?.should be_true
   end
 
 end

data/spec/osm/grouping_spec.rb

@@ -16,6 +16,7 @@ describe "Grouping" do
     patrol.name.should == 'Patrol Name'
     patrol.active.should == true
     patrol.points.should == 2
+    patrol.valid?.should be_true
   end
 
 end

data/spec/osm/member_spec.rb

@@ -71,6 +71,7 @@ describe "Member" do
     member.joined.should == Date.new(2006, 1, 7)
     member.age.should == '06/07'
     member.joined_years.should == 1
+    member.valid?.should be_true
   end
 
 

data/spec/osm/register_data_spec.rb

@@ -29,6 +29,7 @@ describe "Register Data" do
       Date.new(2012, 01, 10) => 'Yes',
       Date.new(2012, 01, 24) => 'No'
     }
+    rd.valid?.should be_true
   end
 
 end

data/spec/osm/register_field_spec.rb

@@ -18,6 +18,7 @@ describe "Register Field" do
     field.id.should == 'machine_name'
     field.name.should == 'Human name'
     field.tooltip.should == 'Tooltip'
+    field.valid?.should be_true
   end
 
 end

data/spec/osm/role_spec.rb

@@ -8,6 +8,9 @@ class DummySection
   def initialize(options={})
     options.each { |k,v| instance_variable_set("@#{k}", v) }
   end
+  def valid?
+    true
+  end
 end
 
 
@@ -17,12 +20,12 @@ describe "Role" do
     data = {
       'sectionid' => 1,
       'sectionname' => 'A Section',
-      'sectionConfig' => '{}',
+      'sectionConfig' => '{"subscription_expires":"2000-01-02","numscouts":0}',
       'groupname' => 'A Group',
       'groupid' => '2',
       'groupNormalised' => '3',
       'isDefault' => '1',
-      'permissions' => {}
+      'permissions' => {'something' => 100}
     }
     role = Osm::Role.from_api(data)
 
@@ -30,6 +33,7 @@ describe "Role" do
     role.section.name.should == 'A Section'
     role.group_id.should == 2
     role.group_name.should == 'A Group'
+    role.valid?.should be_true
   end
 
 

data/spec/osm/section_spec.rb

@@ -78,6 +78,8 @@ describe "Section" do
     section.flexi_records[1].id.should == 2
     section.flexi_records[1].name.should == 'Name 2'
     section.role.should == role
+
+    section.valid?.should be_true
   end
 
   it "Create has sensible defaults" do

data/spec/osm/term_spec.rb

@@ -10,7 +10,7 @@ describe "Term" do
       :section_id => 2,
       :name => 'Term name',
       :start => Date.new(2001, 01, 01),
-      :end => Date.new(2001, 03, 31)
+      :finish => Date.new(2001, 03, 31)
     }
   end
 
@@ -28,7 +28,8 @@ describe "Term" do
     term.section_id.should == 2
     term.name.should == 'Term name'
     term.start.should == Date.new(2001, 1, 1)
-    term.end.should == Date.new(2001, 3, 31)
+    term.finish.should == Date.new(2001, 3, 31)
+    term.valid?.should be_true
   end
 
 
@@ -46,11 +47,11 @@ describe "Term" do
 
 
   it "Sorts by Section ID, Start date and then Term ID" do
-    term1 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 11, :start => (Date.today - 60), :end => (Date.today - 1)))
-    term2 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 12, :start => (Date.today -  0), :end => (Date.today + 0)))
-    term3 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 13, :start => (Date.today +  1), :end => (Date.today + 60)))
-    term4 = Osm::Term.new(@attributes.merge(:section_id => 2, :term => 1, :start => (Date.today +  1), :end => (Date.today + 60)))
-    term5 = Osm::Term.new(@attributes.merge(:section_id => 2, :term => 2, :start => (Date.today +  1), :end => (Date.today + 60)))
+    term1 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 11, :start => (Date.today - 60), :finish => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 12, :start => (Date.today -  0), :finish => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 13, :start => (Date.today +  1), :finish => (Date.today + 60)))
+    term4 = Osm::Term.new(@attributes.merge(:section_id => 2, :term => 1, :start => (Date.today +  1), :finish => (Date.today + 60)))
+    term5 = Osm::Term.new(@attributes.merge(:section_id => 2, :term => 2, :start => (Date.today +  1), :finish => (Date.today + 60)))
 
     data = [term5, term3, term2, term4, term1]
     data.sort.should == [term1, term2, term3, term4, term5]
@@ -58,9 +59,9 @@ describe "Term" do
 
 
   it "Works out if it is completly before a date" do
-    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
-    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
-    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :finish => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :finish => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :finish => (Date.today + 60)))
 
     term1.before?(Date.today).should == true
     term2.before?(Date.today).should == false
@@ -69,9 +70,9 @@ describe "Term" do
 
 
   it "Works out if it is completly after a date" do
-    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
-    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
-    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :finish => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :finish => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :finish => (Date.today + 60)))
 
     term1.after?(Date.today).should == false
     term2.after?(Date.today).should == false
@@ -80,9 +81,9 @@ describe "Term" do
 
 
   it "Works out if it has passed" do
-    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
-    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
-    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :finish => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :finish => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :finish => (Date.today + 60)))
 
     term1.past?().should == true
     term2.past?().should == false
@@ -91,9 +92,9 @@ describe "Term" do
 
 
   it "Works out if it is in the future" do
-    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
-    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
-    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :finish => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :finish => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :finish => (Date.today + 60)))
 
     term1.future?().should == false
     term2.future?().should == false
@@ -102,9 +103,9 @@ describe "Term" do
 
 
   it "Works out if it is the current term" do
-    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
-    term2 = Osm::Term.new(@attributes.merge(:start=> (Date.today -  0), :end => (Date.today + 0)))
-    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :finish => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start=> (Date.today -  0), :finish => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :finish => (Date.today + 60)))
 
     term1.current?().should == false
     term2.current?().should == true
@@ -113,9 +114,9 @@ describe "Term" do
 
 
   it "Works out if it contains a date" do
-    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
-    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
-    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :finish => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :finish => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :finish => (Date.today + 60)))
 
     term1.contains_date?(Date.today).should == false
     term2.contains_date?(Date.today).should == true

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'fakeweb'
 require 'httparty'
 require 'active_support'
+require 'active_attr/rspec'
+require 'active_model'
 
 require 'osm'
 

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000Z
+date: 2012-09-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &76908740 !ruby/object:Gem::Requirement
+  requirement: &83140270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *76908740
+  version_requirements: *83140270
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &76900500 !ruby/object:Gem::Requirement
+  requirement: &83124630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76900500
+  version_requirements: *83124630
+- !ruby/object:Gem::Dependency
+  name: active_attr
+  requirement: &83124090 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *83124090
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &83123540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *83123540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &76900110 !ruby/object:Gem::Requirement
+  requirement: &83123160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76900110
+  version_requirements: *83123160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76899880 !ruby/object:Gem::Requirement
+  requirement: &83122830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76899880
+  version_requirements: *83122830
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &76899670 !ruby/object:Gem::Requirement
+  requirement: &83122500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76899670
+  version_requirements: *83122500
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -82,6 +104,8 @@ files:
 - LICENSE.rdoc
 - README.md
 - Rakefile
+- lib/array_of_validator.rb
+- lib/hash_validator.rb
 - lib/osm.rb
 - lib/osm/activity.rb
 - lib/osm/api.rb