osm 0.1.17 → 0.2.0

data/spec/osm/model_spec.rb

@@ -5,6 +5,9 @@ require 'spec_helper'
 describe "Model" do
 
   class ModelTester < Osm::Model
+    attribute :test_attribute
+    attr_accessible :test_attribute
+
     def self.test_get_config
       {
         :cache => @@cache,
@@ -16,6 +19,11 @@ describe "Model" do
     def self.cache(method, *options)
       self.send("cache_#{method}", *options)
     end
+
+    def self.test_get_all(api, keys, key)
+      ids = cache_read(api, keys)
+      return get_from_ids(api, ids, key, {}, :get_all)
+    end
   end
 
 
@@ -92,49 +100,35 @@ describe "Model" do
   end
 
 
-  describe "Get User Permissions" do
+  describe "Get items from ids" do
 
-    it "From cache" do
-      permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
-      OsmTest::Cache.should_receive('exist?').with('OSMAPI-osm-permissions-user_id') { true }
-      OsmTest::Cache.should_receive('read').with('OSMAPI-osm-permissions-user_id') { permissions }
-      ModelTester.get_user_permissions(@api).should == permissions
+    it "All items in cache" do
+      OsmTest::Cache.write('OSMAPI-osm-items', [1, 2])
+      OsmTest::Cache.write('OSMAPI-osm-item-1', '1')
+      OsmTest::Cache.write('OSMAPI-osm-item-2', '2')
+      ModelTester.test_get_all(@api, 'items', 'item').should == ['1', '2']
     end
-
-    it "From API" do
-      permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
-      OsmTest::Cache.should_receive('exist?').with('OSMAPI-osm-permissions-user_id') { false }
-      Osm::Section.should_receive('fetch_user_permissions').with(@api) { permissions }
-      ModelTester.get_user_permissions(@api).should == permissions
-    end
-
-    it "Single section" do
-      permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
-      OsmTest::Cache.should_receive('exist?').with('OSMAPI-osm-permissions-user_id').twice { true }
-      OsmTest::Cache.should_receive('read').with('OSMAPI-osm-permissions-user_id').twice { permissions }
-      ModelTester.get_user_permissions(@api, 1).should == permissions[1]
-      ModelTester.get_user_permissions(@api, 2).should == permissions[2]
+    
+    it "An item not in cache" do
+      OsmTest::Cache.write('OSMAPI-osm-items', [1, 2])
+      OsmTest::Cache.write('OSMAPI-osm-item-1', '1')
+      ModelTester.stub(:get_all) { ['A', 'B'] }
+      ModelTester.test_get_all(@api, 'items', 'item').should == ['A', 'B']
     end
 
   end
 
 
-  describe "Set User Permissions" do
-
-    it "All Sections" do
-      permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
-      OsmTest::Cache.should_receive('write').with('OSMAPI-osm-permissions-user_id', permissions, {:expires_in=>600}) { true }
-      ModelTester.set_user_permissions(@api, permissions)
-    end
+  describe "Track attribute changes" do
+    test = ModelTester.new(:test_attribute => 1)
+    test.test_attribute.should == 1
+    test.changed_attributes.should == []
 
-    it "Single section" do
-      permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
-      OsmTest::Cache.should_receive('exist?').with('OSMAPI-osm-permissions-user_id') { true }
-      OsmTest::Cache.should_receive('read').with('OSMAPI-osm-permissions-user_id') { permissions }
-      OsmTest::Cache.should_receive('write').with('OSMAPI-osm-permissions-user_id', permissions.merge(3 => {:a => [:read]}), {:expires_in=>600}) { true }
-      ModelTester.set_user_permissions(@api, 3, {:a => [:read]})
-    end
+    test.test_attribute = 2
+    test.changed_attributes.should == ['test_attribute']
 
+    test.reset_changed_attributes
+    test.changed_attributes.should == []
   end
 
 end

data/spec/osm/register_spec.rb

@@ -109,7 +109,7 @@ describe "Register" do
         'completedBadges' => '[{"a":"A"},{"b":"B"}]'
       }
 
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
       Osm::Register.update_attendance({
         :api => @api,
         :section => Osm::Section.new(:id=>1, :type=>:cubs),

data/spec/osm/section_spec.rb

@@ -9,7 +9,7 @@ describe "Section" do
     @attributes = {
       :id => 1,
       :name => 'Name',
-      :subscription_level => :silver,
+      :subscription_level => 2,
       :subscription_expires => (Date.today + 60).strftime('%Y-%m-%d'),
       :type => :cubs,
       :wizard => false,
@@ -46,7 +46,7 @@ describe "Section" do
 
     section.id.should == 1
     section.name.should == 'Name' 
-    section.subscription_level.should == :silver
+    section.subscription_level.should == 2
     section.subscription_expires.should == Date.today + 60
     section.type.should == :cubs
     section.column_names.should == {:column_names => 'names'}
@@ -80,7 +80,7 @@ describe "Section" do
   it "Create has sensible defaults" do
     section = Osm::Section.new
 
-    section.subscription_level.should == :unknown
+    section.subscription_level.should == 1
     section.subscription_expires.should == nil
     section.type.should == :unknown
     section.column_names.should == {}
@@ -103,42 +103,50 @@ describe "Section" do
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
     end
 
-    it "Gets all sections" do
-      sections = Osm::Section.get_all(@api)
-      sections.map{ |i| i.id }.should == [1, 2]
+    describe "Gets all sections" do
+      it "From OSM" do
+        sections = Osm::Section.get_all(@api)
+        sections.map{ |i| i.id }.should == [1, 2]
+  
+        section = sections[0]
+        section.id.should == 1
+        section.name.should == 'Section 1' 
+        section.subscription_level.should == 1
+        section.subscription_expires.should == Date.new(2013, 1, 5)
+        section.type.should == :beavers
+        section.column_names.should == {:column_names => 'names'}
+        section.fields.should == {:fields => true}
+        section.intouch_fields.should == {:intouch_fields => true}
+        section.mobile_fields.should == {:mobile_fields => true}
+        section.group_id.should == 3
+        section.group_name.should == '3rd Somewhere'
+        section.flexi_records.size.should == 1
+        section.flexi_records[0].id.should == 111
+        section.flexi_records[0].name.should == 'Flexi Record 1'
+        section.gocardless.should == true
+        section.myscout_events_expires.should == Date.new(2013, 1, 6)
+        section.myscout_badges_expires.should == Date.new(2013, 1, 7)
+        section.myscout_programme_expires.should == Date.new(2013, 1, 8)
+        section.myscout_events.should == true
+        section.myscout_badges.should == true
+        section.myscout_programme.should == true
+        section.myscout_payments.should == true
+        section.myscout_emails.should == {:email1 => true, :email2 => false}
+        section.myscout_email_address_from.should == 'send_from@example.com'
+        section.myscout_email_address_copy.should == ''
+        section.myscout_badges_partial.should == true
+        section.myscout_programme_summary.should == true
+        section.myscout_event_reminder_count.should == 4
+        section.myscout_event_reminder_frequency.should == 5
+        section.myscout_payment_reminder_count.should == 6
+        section.myscout_payment_reminder_frequency.should == 7
+      end
 
-      section = sections[0]
-      section.id.should == 1
-      section.name.should == 'Section 1' 
-      section.subscription_level.should == :bronze
-      section.subscription_expires.should == Date.new(2013, 1, 5)
-      section.type.should == :beavers
-      section.column_names.should == {:column_names => 'names'}
-      section.fields.should == {:fields => true}
-      section.intouch_fields.should == {:intouch_fields => true}
-      section.mobile_fields.should == {:mobile_fields => true}
-      section.group_id.should == 3
-      section.group_name.should == '3rd Somewhere'
-      section.flexi_records.size.should == 1
-      section.flexi_records[0].id.should == 111
-      section.flexi_records[0].name.should == 'Flexi Record 1'
-      section.gocardless.should == true
-      section.myscout_events_expires.should == Date.new(2013, 1, 6)
-      section.myscout_badges_expires.should == Date.new(2013, 1, 7)
-      section.myscout_programme_expires.should == Date.new(2013, 1, 8)
-      section.myscout_events.should == true
-      section.myscout_badges.should == true
-      section.myscout_programme.should == true
-      section.myscout_payments.should == true
-      section.myscout_emails.should == {:email1 => true, :email2 => false}
-      section.myscout_email_address_from.should == 'send_from@example.com'
-      section.myscout_email_address_copy.should == ''
-      section.myscout_badges_partial.should == true
-      section.myscout_programme_summary.should == true
-      section.myscout_event_reminder_count.should == 4
-      section.myscout_event_reminder_frequency.should == 5
-      section.myscout_payment_reminder_count.should == 6
-      section.myscout_payment_reminder_frequency.should == 7
+      it "From cache" do
+        sections = Osm::Section.get_all(@api)
+        HTTParty.should_not_receive(:post)
+        Osm::Section.get_all(@api).should == sections
+      end
     end
   
     it "Gets a section" do
@@ -148,23 +156,6 @@ describe "Section" do
       section.valid?.should be_true
     end
 
-    it "Fetches user's permissions" do
-      permissions = Osm::Section.fetch_user_permissions(@api)
-      permissions[1].should_not be_nil
-      permissions[1].should == {
-        :badge => [:read],
-        :member => [:read, :write],
-        :user => [:read, :write, :administer],
-        :register => [:read, :write, :administer],
-        :contact => [:read, :write, :administer],
-        :programme => [:read, :write, :administer],
-        :originator => [],
-        :events => [:read, :write, :administer],
-        :finance => [:read, :write, :administer],
-        :flexi => [:read, :write, :administer],
-      }
-    end
-
 
     it "Gets the section's notepad" do
       url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads'
@@ -174,7 +165,7 @@ describe "Section" do
         'userid' => 'user_id',
         'secret' => 'secret',
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>{"1" => "Section 1", "2" => "Section 2"}.to_json}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>{"1" => "Section 1", "2" => "Section 2"}.to_json}) }
       section = Osm::Section.new(:id => 1)
       section.get_notepad(@api).should == 'Section 1'
     end
@@ -188,13 +179,13 @@ describe "Section" do
         'secret' => 'secret',
         'value' => 'content'
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
       section = Osm::Section.new(:id => 1)
       section.set_notepad(@api, 'content').should be_true
     end
 
     it "Sets the section's notepad (fail)" do
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":false}'}) }
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":false}'}) }
       section = Osm::Section.new(:id => 1)
       section.set_notepad(@api, 'content').should be_false
     end
@@ -290,30 +281,6 @@ end
 
 
 
-describe "Section::FlexiRecord" do
-
-  it "Create" do
-    fr = Osm::Section::FlexiRecord.new(:id => 1, :name => 'Name')
-
-    fr.id.should == 1
-    fr.name.should == 'Name' 
-    fr.valid?.should be_true
-  end
-
-
-  it "Sorts Flexi Records by name" do
-    fr1 = Osm::Section::FlexiRecord.new(:id => 3, :name => 'A')
-    fr2 = Osm::Section::FlexiRecord.new(:id => 2, :name => 'B')
-    fr3 = Osm::Section::FlexiRecord.new(:id => 1, :name => 'C')
-    records = [fr2, fr1, fr3]
-
-    records.sort.should == [fr1, fr2, fr3]
-  end
-
-end
-
-
-
 describe "Online Scout Manager API Strangeness" do
 
   it "handles a section with no type" do

data/spec/osm/term_spec.rb

@@ -37,7 +37,7 @@ describe "Term" do
     term.should_not == Osm::Term.new(@attributes.merge(:id => 3))
   end
 
-  it "Sorts by Section ID, Start date and then Term ID" do
+  it "Sorts by Section ID, Start date and th Term ID" do
     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)))
@@ -131,16 +131,24 @@ describe "Term" do
     end
 
 
-    it "Gets all terms" do
-      terms = Osm::Term.get_all(@api)
-      terms.size.should == 3
-      terms.map{ |i| i.id }.should == [1, 2, 3]
-      term = terms[0]
-      term.is_a?(Osm::Term).should be_true
-      term.id.should == 1
-      term.name.should == 'Term 1'
-      term.start.should == (Date.today + 31)
-      term.finish.should == (Date.today + 90)
+    describe "Get all terms" do
+      it "From OSM" do
+        terms = Osm::Term.get_all(@api)
+        terms.size.should == 3
+        terms.map{ |i| i.id }.should == [1, 2, 3]
+        term = terms[0]
+        term.is_a?(Osm::Term).should be_true
+        term.id.should == 1
+        term.name.should == 'Term 1'
+        term.start.should == (Date.today + 31)
+        term.finish.should == (Date.today + 90)
+      end
+
+      it "From cache" do
+        terms = Osm::Term.get_all(@api)
+        HTTParty.should_not_receive(:post)
+        Osm::Term.get_all(@api).should == terms
+      end
     end
 
     it "Gets all terms for a section" do
@@ -191,7 +199,7 @@ describe "Term" do
       }
 
       Osm::Term.stub(:get_all) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"terms":{}}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"terms":{}}'}) }
 
       Osm::Term.create(@api, {
         :section => 1,
@@ -215,7 +223,7 @@ describe "Term" do
       }
 
       Osm::Term.stub(:get_all) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
 
       Osm::Term.create(@api, {
         :section => 1,
@@ -238,7 +246,7 @@ describe "Term" do
         'termid' => 2
       }
       Osm::Term.stub(:get_all) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"terms":{}}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"terms":{}}'}) }
 
       term = Osm::Term.new(:id=>2, :section_id=>1, :name=>'A Term', :start=>Date.new(2010, 01, 01), :finish=>Date.new(2010, 12, 31))
       term.update(@api).should be_true
@@ -257,7 +265,7 @@ describe "Term" do
         'termid' => 2
       }
       Osm::Term.stub(:get_all) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
 
       term = Osm::Term.new(:id=>2, :section_id=>1, :name=>'A Term', :start=>Date.new(2010, 01, 01), :finish=>Date.new(2010, 12, 31))
       term.update(@api).should be_false

data/spec/spec_helper.rb

@@ -44,6 +44,8 @@ RSpec.configure do |config|
     Osm::configure(@CONFIGURATION)
     
     @api = Osm::Api.new('user_id', 'secret')
+    Osm::Model.stub(:require_ability_to) {}
+    Osm::Model.stub(:require_access_to_section) {}
   end
 end
 
@@ -66,5 +68,28 @@ module OsmTest
     def self.clear
       @@cache = {}
     end
+    def self.inspect
+      @@cache.inspect
+    end
+  end
+
+  class DummyHttpResult
+    def initialize(options={})
+      @response = OsmTest::DummyHttpResponse.new(options[:response])
+    end
+    def response
+      @response
+    end
+  end
+  class DummyHttpResponse
+    def initialize(options={})
+      @options = options
+    end
+    def code
+      @options[:code]
+    end
+    def body
+      @options[:body]
+    end
   end
 end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.17"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000Z
+date: 2013-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &80603000 !ruby/object:Gem::Requirement
+  requirement: &88142390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *80603000
+  version_requirements: *88142390
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &80601890 !ruby/object:Gem::Requirement
+  requirement: &88141970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *80601890
+  version_requirements: *88141970
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &80600900 !ruby/object:Gem::Requirement
+  requirement: &88141440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *80600900
+  version_requirements: *88141440
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &80599810 !ruby/object:Gem::Requirement
+  requirement: &88141060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *80599810
+  version_requirements: *88141060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &80599380 !ruby/object:Gem::Requirement
+  requirement: &88140610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *80599380
+  version_requirements: *88140610
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80598830 !ruby/object:Gem::Requirement
+  requirement: &88122850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *80598830
+  version_requirements: *88122850
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &80596730 !ruby/object:Gem::Requirement
+  requirement: &88122440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,29 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *80596730
+  version_requirements: *88122440
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &88122180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: *88122180
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: &88121560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+  type: :development
+  prerelease: false
+  version_requirements: *88121560
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -101,6 +123,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.rdoc
 - README.md
 - Rakefile
@@ -111,10 +134,10 @@ files:
 - lib/osm/api.rb
 - lib/osm/api_access.rb
 - lib/osm/due_badges.rb
-- lib/osm/evening.rb
 - lib/osm/event.rb
 - lib/osm/flexi_record.rb
 - lib/osm/grouping.rb
+- lib/osm/meeting.rb
 - lib/osm/member.rb
 - lib/osm/model.rb
 - lib/osm/register.rb
@@ -125,10 +148,10 @@ files:
 - spec/osm/api_access_spec.rb
 - spec/osm/api_spec.rb
 - spec/osm/due_badges_spec.rb
-- spec/osm/evening_spec.rb
 - spec/osm/event_spec.rb
 - spec/osm/flexi_record_spec.rb
 - spec/osm/grouping_spec.rb
+- spec/osm/meeting_spec.rb
 - spec/osm/member_spec.rb
 - spec/osm/model_spec.rb
 - spec/osm/osm_spec.rb