osm 0.1.17 → 0.2.0

data/spec/osm/api_access_spec.rb

@@ -38,14 +38,22 @@ describe "API Access" do
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getAPIAccess&sectionid=1", :body => body.to_json)
     end
 
-    it "Get All" do
-      api_accesses = Osm::ApiAccess.get_all(@api, 1)
+    describe "Get All" do
+      it "From OSM" do
+        api_accesses = Osm::ApiAccess.get_all(@api, 1)
+  
+        api_accesses.size.should == 2
+        api_access = api_accesses[0]
+        api_access.id.should == 1
+        api_access.name.should == 'API Name'
+        api_access.permissions.should == {:read => [:read], :readwrite => [:read, :write]}
+      end
 
-      api_accesses.size.should == 2
-      api_access = api_accesses[0]
-      api_access.id.should == 1
-      api_access.name.should == 'API Name'
-      api_access.permissions.should == {:read => [:read], :readwrite => [:read, :write]}
+      it "From cache" do
+        api_accesses = Osm::ApiAccess.get_all(@api, 1)
+        HTTParty.should_not_receive(:post)
+        Osm::ApiAccess.get_all(@api, 1).should == api_accesses
+      end
     end
 
     it "Get One" do

data/spec/osm/api_spec.rb

@@ -2,30 +2,8 @@
 require 'spec_helper'
 
 
-class DummyHttpResult
-  def initialize(options={})
-    @response = 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
-
-
 describe "API" do
 
-
   it "Create" do
     @api.should_not be_nil
     @api.api_id.should == @CONFIGURATION[:api][:osm][:id]
@@ -68,7 +46,7 @@ describe "API" do
       'email' => user_email,
       'password' => user_password,
     }
-    HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"userid":"id","secret":"secret"}'}) }
+    HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"userid":"id","secret":"secret"}'}) }
 
     Osm::Api.authorize(user_email, user_password).should == {:user_id => 'id', :secret => 'secret'}
   end
@@ -81,15 +59,64 @@ describe "API" do
       'token' => @CONFIGURATION[:api][:osm][:token],
       'userid' => '1',
       'secret' => '2',
-    }}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
+    }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
     @api.perform_query('test')
   end
 
 
+  describe "User Permissions" do
+
+    it "Get from API" do
+      body = [
+        {"sectionid"=>"1", "permissions"=>{"a"=>20}},
+        {"sectionid"=>"2", "permissions"=>{"a"=>10}}
+      ]
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
+
+      permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
+      OsmTest::Cache.should_not_receive('read')
+      @api.get_user_permissions.should == permissions
+    end
+
+    it "Get 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 }
+      @api.get_user_permissions.should == permissions
+    end
+
+    it "Get ignoring cache" do
+      data = [
+        {"sectionid"=>"1", "permissions"=>{"a"=>10}},
+      ]
+      body = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+      }
+      url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles'
+
+      OsmTest::Cache.should_not_receive('exist?').with('OSMAPI-osm-permissions-user_id')
+      OsmTest::Cache.should_not_receive('read').with('OSMAPI-osm-permissions-user_id')
+      HTTParty.should_receive(:post).with(url, {:body=>body}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+      @api.get_user_permissions(:no_cache => true).should == {1 => {:a => [:read]}}
+    end
+
+    it "Set" 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 }
+      @api.set_user_permissions(3, {:a => [:read]})
+    end
+
+  end
+
 
   describe "OSM and Internet error conditions:" do
     it "Raises a connection error if the HTTP status code was not 'OK'" do
-      HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'500'}) }
+      HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'500'}) }
       expect{ Osm::Api.authorize('email@example.com', 'password') }.to raise_error(Osm::ConnectionError, 'HTTP Status code was 500')
     end
 
@@ -101,12 +128,12 @@ describe "API" do
 
 
     it "Raises an error if OSM returns an error (as a hash)" do
-      HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"error":"Error message"}'}) }
+      HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"error":"Error message"}'}) }
       expect{ Osm::Api.authorize('email@example.com', 'password') }.to raise_error(Osm::Error, 'Error message')
     end
 
     it "Raises an error if OSM returns an error (as a plain string)" do
-      HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'Error message'}) }
+      HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'Error message'}) }
       expect{ Osm::Api.authorize('email@example.com', 'password') }.to raise_error(Osm::Error, 'Error message')
     end
   end

data/spec/osm/event_spec.rb

@@ -128,75 +128,84 @@ describe "Event" do
       Osm::Model.stub(:get_user_permissions) { {:events => [:read, :write]} }
     end
 
-    it "Get events for section" do
-      events = Osm::Event.get_for_section(@api, 1)
-      events.size.should == 1
-      event = events[0]
-      event.id.should == 2
-      event.section_id.should == 1
-      event.name.should == 'An Event'
-      event.start.should == Date.new(2001, 1, 2)
-      event.finish.should == DateTime.new(2001, 2, 5, 12, 0, 0)
-      event.cost.should == '0.00'
-      event.location.should == 'Somewhere'
-      event.notes.should == 'Notes'
-      event.archived.should be_false
-      event.notepad.should == 'notepad'
-      event.public_notepad.should == 'public notepad'
-      event.confirm_by_date.should == Date.new(2002, 1, 2)
-      event.allow_changes.should == true
-      event.reminders.should == false
-      event.attendance_limit.should == 3
-      event.attendance_limit_includes_leaders.should == true
-      event.columns[0].id.should == 'f_1'
-      event.columns[0].name.should == 'Name'
-      event.columns[0].label.should == 'Label'
-      event.valid?.should be_true
-    end
-
-    it "Fetch events for a section honoring archived option" do
-      body = {
-        'identifier' => 'eventid',
-        'label' => 'name',
-        'items' => [{
-          'eventid' => '1',
-          'name' => 'An Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '0'
-        },{
-          'eventid' => '2',
-          'name' => 'An Archived Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '1'
-        }]
-      }
-
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => body.to_json)
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=1", :body => {'config' => '[]', 'archived' => '0', 'eventid' => '1'}.to_json)
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=2", :body => {'config' => '[]', 'archived' => '1', 'eventid' => '2'}.to_json)
+    describe "Get events for section" do
+      it "From OSM" do
+        events = Osm::Event.get_for_section(@api, 1)
+        events.size.should == 1
+        event = events[0]
+        event.id.should == 2
+        event.section_id.should == 1
+        event.name.should == 'An Event'
+        event.start.should == Date.new(2001, 1, 2)
+        event.finish.should == DateTime.new(2001, 2, 5, 12, 0, 0)
+        event.cost.should == '0.00'
+        event.location.should == 'Somewhere'
+        event.notes.should == 'Notes'
+        event.archived.should be_false
+        event.notepad.should == 'notepad'
+        event.public_notepad.should == 'public notepad'
+        event.confirm_by_date.should == Date.new(2002, 1, 2)
+        event.allow_changes.should == true
+        event.reminders.should == false
+        event.attendance_limit.should == 3
+        event.attendance_limit_includes_leaders.should == true
+        event.columns[0].id.should == 'f_1'
+        event.columns[0].name.should == 'Name'
+        event.columns[0].label.should == 'Label'
+        event.valid?.should be_true
+      end
 
-      events = Osm::Event.get_for_section(@api, 1)
-      all_events = Osm::Event.get_for_section(@api, 1, {:include_archived => true})
+      it "From cache" do
+        events = Osm::Event.get_for_section(@api, 1)
+        HTTParty.should_not_receive(:post)
+        Osm::Event.get_for_section(@api, 1).should == events
+      end
 
-      events.size.should == 1
-      events[0].id == 1
-      all_events.size.should == 2
+      it "Honours archived option" do
+        body = {
+          'identifier' => 'eventid',
+          'label' => 'name',
+          'items' => [{
+            'eventid' => '1',
+            'name' => 'An Event',
+            'startdate' => '2001-02-03',
+            'enddate' => nil,
+            'starttime' => '00:00:00',
+            'endtime' => '00:00:00',
+            'cost' => '0.00',
+            'location' => '',
+            'notes' => '',
+            'sectionid' => 1,
+            'googlecalendar' => nil,
+            'archived' => '0'
+          },{
+            'eventid' => '2',
+            'name' => 'An Archived Event',
+            'startdate' => '2001-02-03',
+            'enddate' => nil,
+            'starttime' => '00:00:00',
+            'endtime' => '00:00:00',
+            'cost' => '0.00',
+            'location' => '',
+            'notes' => '',
+            'sectionid' => 1,
+            'googlecalendar' => nil,
+            'archived' => '1'
+          }]
+        }
+
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => body.to_json)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=1", :body => {'config' => '[]', 'archived' => '0', 'eventid' => '1'}.to_json)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=2", :body => {'config' => '[]', 'archived' => '1', 'eventid' => '2'}.to_json)
+
+        events = Osm::Event.get_for_section(@api, 1)
+        OsmTest::Cache.clear
+        all_events = Osm::Event.get_for_section(@api, 1, {:include_archived => true})
+
+        events.size.should == 1
+        events[0].id == 1
+        all_events.size.should == 2
+      end
     end
 
     it "Get event" do
@@ -331,7 +340,7 @@ describe "Event" do
       }
 
       Osm::Event.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
 
       event = Osm::Event.create(@api, {
         :section_id => 1,
@@ -356,7 +365,7 @@ describe "Event" do
 
     it "Create (failed)" do
       Osm::Event.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
 
       event = Osm::Event.create(@api, {
         :section_id => 1,
@@ -400,9 +409,9 @@ describe "Event" do
         'limitincludesleaders' => true,
       }
 
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
-      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/events.php?action=saveNotepad&sectionid=1', {:body=>{"eventid"=>2, "notepad"=>"notepad", "userid"=>"user_id", "secret"=>"secret", "apiid"=>"1", "token"=>"API TOKEN"}}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
-      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/events.php?action=saveNotepad&sectionid=1', {:body=>{"eventid"=>2, "pnnotepad"=>"public notepad", "userid"=>"user_id", "secret"=>"secret", "apiid"=>"1", "token"=>"API TOKEN"}}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
+      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/events.php?action=saveNotepad&sectionid=1', {:body=>{"eventid"=>2, "notepad"=>"notepad", "userid"=>"user_id", "secret"=>"secret", "apiid"=>"1", "token"=>"API TOKEN"}}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/events.php?action=saveNotepad&sectionid=1', {:body=>{"eventid"=>2, "pnnotepad"=>"public notepad", "userid"=>"user_id", "secret"=>"secret", "apiid"=>"1", "token"=>"API TOKEN"}}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
 
       event = Osm::Event.new(
         :section_id => 1,
@@ -416,16 +425,18 @@ describe "Event" do
         :confirm_by_date => nil,
         :allow_changes => true,
         :reminders => true,
-        :notepad => 'notepad',
-        :public_notepad => 'public notepad',
+        :notepad => '',
+        :public_notepad => '',
         :attendance_limit => 3,
         :attendance_limit_includes_leaders => true,
       )
+      event.notepad = 'notepad'
+      event.public_notepad = 'public notepad'
       event.update(@api).should be_true
     end
 
     it "Update (failed)" do
-      HTTParty.should_receive(:post).exactly(3).times { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      HTTParty.should_receive(:post).exactly(1).times { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
 
       event = Osm::Event.new(
         :section_id => 1,
@@ -450,7 +461,7 @@ describe "Event" do
         'secret' => 'secret',
       }
 
-      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}'}) }
 
       event = Osm::Event.new(
         :section_id => 1,
@@ -466,7 +477,7 @@ describe "Event" do
     end
 
     it "Delete (failed)" 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}'}) }
 
       event = Osm::Event.new(
         :section_id => 1,
@@ -535,7 +546,7 @@ describe "Event" do
           'userid' => 'user_id',
           'secret' => 'secret',
         }}
-      ) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      ) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
 
       ea.update(@api, 'f_1').should be_true
     end
@@ -555,7 +566,7 @@ describe "Event" do
         'eventid' => '2',
         'config' => '[{"id":"f_1","name":"Test name","pL":"Test label"}]'
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>body.to_json}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>body.to_json}) }
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       event.should_not be_nil
@@ -567,7 +578,7 @@ describe "Event" do
     end
 
     it "Add column (failed)" do
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[]"}'}) }
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[]"}'}) }
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       event.should_not be_nil
@@ -590,7 +601,7 @@ describe "Event" do
         'eventid' => '2',
         'config' => '[{"id":"f_1","name":"New name","pL":"New label"}]'
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>body.to_json}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>body.to_json}) }
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       event.columns = [Osm::Event::Column.new(:id => 'f_1', :event => event)]
@@ -607,7 +618,7 @@ describe "Event" do
     end
 
     it "Update column (failed)" do
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[]"}'}) }
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[]"}'}) }
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       column = Osm::Event::Column.new(:id => 'f_1', :event => event)
@@ -626,7 +637,7 @@ describe "Event" do
         'columnId' => 'f_1'
       }
 
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"eventid":"2","config":"[]"}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"eventid":"2","config":"[]"}'}) }
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       column = Osm::Event::Column.new(:id => 'f_1', :event => event)
@@ -637,7 +648,7 @@ describe "Event" do
     end
 
     it "Delete column (failed)" do
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[{\"id\":\"f_1\"}]"}'}) }
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[{\"id\":\"f_1\"}]"}'}) }
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       column = Osm::Event::Column.new(:id => 'f_1', :event => event)

data/spec/osm/flexi_record_spec.rb

@@ -5,11 +5,24 @@ require 'date'
 
 describe "Flexi Record" do
 
-  it "Create FlexiRecord::Field" do
-    field = Osm::FlexiRecord::Field.new(
+  it "Create" do
+    fr = Osm::FlexiRecord.new(
+      :id => 1,
+      :section_id => 2,
+      :name => 'name'
+    )
+    fr.id.should == 1
+    fr.section_id.should == 2
+    fr.name.should == 'name'
+    fr.valid?.should be_true
+  end
+
+  it "Create FlexiRecord::Column" do
+    field = Osm::FlexiRecord::Column.new(
       :id => "f_1",
       :name => "Field Name",
-      :editable => true
+      :editable => true,
+      :flexi_record => Osm::FlexiRecord.new(),
     )
 
     field.id.should == 'f_1'
@@ -31,7 +44,8 @@ describe "Flexi Record" do
         'age' => nil,
         'f_1' => 'a',
         'f_2' => 'b',
-      }
+      },
+      :flexi_record => Osm::FlexiRecord.new()
     )
 
     rd.member_id.should == 1
@@ -49,9 +63,22 @@ describe "Flexi Record" do
     rd.valid?.should be_true
   end
 
+  it "Sorts by name" do
+    fr1 = Osm::FlexiRecord.new(:id => 3, :name => 'A')
+    fr2 = Osm::FlexiRecord.new(:id => 2, :name => 'B')
+    fr3 = Osm::FlexiRecord.new(:id => 1, :name => 'C')
+    records = [fr2, fr1, fr3]
+
+    records.sort.should == [fr1, fr2, fr3]
+  end
+
 
   describe "Using the API" do
 
+    before :each do
+      @flexi_record = Osm::FlexiRecord.new(:section_id => 1, :id => 2, :name => 'A Flexi Record')
+    end
+
     it "Fetch Fields" do
       data = {
         "extraid" => "2",
@@ -76,7 +103,7 @@ describe "Flexi Record" do
       }
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/extras.php?action=getExtra&sectionid=1&extraid=2", :body => data.to_json)
 
-      fields = Osm::FlexiRecord.get_fields(@api, 1, 2)
+      fields = @flexi_record.get_columns(@api)
       fields.is_a?(Array).should be_true
       fields[0].valid?.should be_true
       fields[0].id.should == 'firstname'
@@ -116,9 +143,9 @@ describe "Flexi Record" do
           ]}
         ]
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
 
-      Osm::FlexiRecord.add_field(@api, 1, 2, 'name').should be_true
+      @flexi_record.add_column(@api, 'name').should be_true
     end
 
     it "Add field (failure)" do
@@ -141,9 +168,9 @@ describe "Flexi Record" do
           ]}
         ]
       }
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
 
-      Osm::FlexiRecord.add_field(@api, 1, 2, 'name').should be_false
+      @flexi_record.add_column(@api, 'name').should be_false
     end
 
     it "Update field (success)" do
@@ -178,9 +205,15 @@ describe "Flexi Record" do
           ]}
         ]
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
-
-      Osm::FlexiRecord.update_field(@api, 1, 2, 'f_1', 'name').should be_true
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      col = Osm::FlexiRecord::Column.new(
+        :flexi_record => @flexi_record,
+        :id => 'f_1',
+        :name => 'name',
+        :editable => true
+      )
+      col.update(@api).should be_true
     end
 
     it "Update field (failure)" do
@@ -203,11 +236,26 @@ describe "Flexi Record" do
           ]}
         ]
       }
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
-
-      Osm::FlexiRecord.update_field(@api, 1, 2, 'f_1', 'name').should be_false
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      col = Osm::FlexiRecord::Column.new(
+        :flexi_record => @flexi_record,
+        :id => 'f_1',
+        :name => 'name',
+        :editable => true
+      )
+      col.update(@api).should be_false
     end
 
+    it "Update field (uneditable)" do
+      col = Osm::FlexiRecord::Column.new(
+        :flexi_record => @flexi_record,
+        :id => 'f_1',
+        :name => 'name',
+        :editable => false
+      )
+      expect{ col.update(@api) }.to raise_error(Osm::Forbidden)
+    end
 
     it "Delete field (success)" do
       url = "https://www.onlinescoutmanager.co.uk/extras.php?action=deleteColumn&sectionid=1&extraid=2"
@@ -238,9 +286,16 @@ describe "Flexi Record" do
           {"rows" => []}
         ]
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
 
-      Osm::FlexiRecord.delete_field(@api, 1, 2, 'f_1').should be_true
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      col = Osm::FlexiRecord::Column.new(
+        :flexi_record => @flexi_record,
+        :id => 'f_1',
+        :name => 'name',
+        :editable => true
+      )
+      col.delete(@api).should be_true
     end
 
     it "Delete field (failure)" do
@@ -263,11 +318,26 @@ describe "Flexi Record" do
           ]}
         ]
       }
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
-
-      Osm::FlexiRecord.delete_field(@api, 1, 2, 'f_1').should be_false
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      col = Osm::FlexiRecord::Column.new(
+        :flexi_record => @flexi_record,
+        :id => 'f_1',
+        :name => 'name',
+        :editable => true
+      )
+      col.delete(@api).should be_false
     end
 
+    it "Delete field (uneditable)" do
+      col = Osm::FlexiRecord::Column.new(
+        :flexi_record => @flexi_record,
+        :id => 'f_1',
+        :name => 'name',
+        :editable => false
+      )
+      expect{ col.delete(@api) }.to raise_error(Osm::Forbidden)
+    end
 
     it "Fetch Data" do
       data = {
@@ -288,8 +358,9 @@ describe "Flexi Record" do
         }]
       }
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/extras.php?action=getExtraRecords&sectionid=1&extraid=2&termid=3&section=cubs", :body => data.to_json)
+      Osm::Section.stub(:get) { Osm::Section.new(:id => 1, :type => :cubs) }
 
-      records = Osm::FlexiRecord.get_data(@api, Osm::Section.new(:id => 1, :type => :cubs), 2, 3)
+      records = @flexi_record.get_data(@api, 3)
       records.is_a?(Array).should be_true
       records.size.should == 1
       record = records[0]
@@ -317,36 +388,68 @@ describe "Flexi Record" do
         'token' => @CONFIGURATION[:api][:osm][:token],
         'userid' => 'user_id',
         'secret' => 'secret',
-        'termid' => 1,
-        'scoutid' => 2,
+        'termid' => 3,
+        'scoutid' => 4,
         'column' => 'f_1',
         'value' => 'value',
-        'sectionid' => 3,
-        'extraid' => 4,
+        'sectionid' => 1,
+        'extraid' => 2,
       }
 
       data = {
         'items' => [
-          {'f_1' => 'value', 'scoutid' => '2'},
+          {'f_1' => 'value', 'scoutid' => '4'},
         ]
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
-      Osm::Term.stub(:get_current_term_for_section) { Osm::Term.new(:id => 1) }
-
-      Osm::FlexiRecord.update_data(@api, 3, 4, 2, 'f_1', 'value').should be_true
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+      Osm::Term.stub(:get_current_term_for_section) { Osm::Term.new(:id => 3) }
+
+      fr = Osm::FlexiRecord.new(:section_id => 1, :id => 2)
+      fr.stub(:get_columns) { [Osm::FlexiRecord::Column.new(:id => 'f_1', :editable => true)] }
+      fr_data = Osm::FlexiRecord::Data.new(
+        :flexi_record => fr,
+        :member_id => 4,
+        :grouping_id => 5,
+        :fields => {'f_1' => 'value'}
+      )
+      fr_data.update(@api).should be_true
     end
 
     it "Update data (failed)" do
       data = {
         'items' => [
-          {'f_1' => 'old value', 'scoutid' => '2'},
+          {'f_1' => 'old value', 'scoutid' => '4'},
         ]
       }
 
-      HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+      HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+      Osm::Term.stub(:get_current_term_for_section) { Osm::Term.new(:id => 1) }
+
+      fr = Osm::FlexiRecord.new(:section_id => 1, :id => 2)
+      fr.stub(:get_columns) { [Osm::FlexiRecord::Column.new(:id => 'f_1', :editable => true)] }
+
+      fr_data = Osm::FlexiRecord::Data.new(
+        :flexi_record => fr,
+        :member_id => 4,
+        :grouping_id => 5,
+        :fields => {'f_1' => 'value'}
+      )
+      fr_data.update(@api).should be_false
+    end
+
+    it "Update data (uneditable field)" do
       Osm::Term.stub(:get_current_term_for_section) { Osm::Term.new(:id => 1) }
 
-      Osm::FlexiRecord.update_data(@api, 3, 4, 2, 'f_1', 'value').should be_false
+      fr = Osm::FlexiRecord.new(:section_id => 1, :id => 2)
+      fr.stub(:get_columns) { [Osm::FlexiRecord::Column.new(:id => 'f_1', :editable => false)] }
+
+      fr_data = Osm::FlexiRecord::Data.new(
+        :flexi_record => fr,
+        :member_id => 4,
+        :grouping_id => 5,
+        :fields => {'f_1' => 'value'}
+      )
+      fr_data.update(@api).should be_true
     end
 
 
@@ -381,8 +484,9 @@ describe "Flexi Record" do
         }]
       }
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/extras.php?action=getExtraRecords&sectionid=1&extraid=2&termid=3&section=cubs", :body => data.to_json)
+      Osm::Section.stub(:get) { Osm::Section.new(:id => 1, :type => :cubs) }
 
-      records = Osm::FlexiRecord.get_data(@api, Osm::Section.new(:id => 1, :type => :cubs), 2, 3)
+      records = @flexi_record.get_data(@api, 3)
       records.is_a?(Array).should be_true
       records.size.should == 1
       record = records[0]
@@ -392,7 +496,6 @@ describe "Flexi Record" do
       record.fields['lastname'].should == 'Last'
     end
 
-
   end
 
 end