acts_as_authoritah 2.0.3 → 2.0.4

data/Gemfile

@@ -2,5 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in acts_as_authoritah.gemspec
 gemspec
-gem 'spreadsheet'
 

data/lib/acts_as_authoritah/acl_loader.rb

@@ -5,7 +5,7 @@ class ActsAsAuthoritah::AclLoader
     @path = path
     @files = []
     @contexts = []
-    Dir.glob(File.join(@path,"*.xls")).each{ |x|
+    Dir.glob(File.join(@path,"*.csv")).each{ |x|
       @files    << x
       @contexts << File.split(x).last.split('.').first
     }

data/lib/acts_as_authoritah/spreadsheets/spreadsheet_reader.rb

@@ -1,8 +1,7 @@
 class ActsAsAuthoritah::SpreadsheetReader
   def initialize(path)
     if File.exists?(path)
-      @book  = Spreadsheet.open path
-      @sheet = @book.worksheets.first
+      @sheet  = CSV.parse open(path).read.strip
     else
       @error = "File not found"
     end

data/lib/acts_as_authoritah/version.rb

@@ -1,3 +1,3 @@
 module ActsAsAuthoritah
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/lib/acts_as_authoritah.rb

@@ -13,8 +13,7 @@ require "acts_as_authoritah/acl_loader"
 require "acts_as_authoritah/identifier_parser"
 require "acts_as_authoritah/errors.rb"
 
-require 'spreadsheet'
-Spreadsheet.client_encoding = 'UTF-8'
+require 'csv'
 
 require "acts_as_authoritah/spreadsheets/access_rights_mapper"
 require "acts_as_authoritah/spreadsheets/spreadsheet_wrapper"

data/spec/acts_as_authoritah/spreadsheets/spreadsheet_reader_spec.rb

@@ -2,20 +2,20 @@ require 'spec_helper'
 
 describe ActsAsAuthoritah::SpreadsheetReader do
   it "should be able to open a spreadsheet give a valid path" do
-    ActsAsAuthoritah::SpreadsheetReader.new("spec/data/default.xls").valid?.should eq true
+    ActsAsAuthoritah::SpreadsheetReader.new("spec/data/default.csv").valid?.should eq true
   end
   
   it "should be invalid if file not found" do
-    ActsAsAuthoritah::SpreadsheetReader.new("spec/data/no_such_file.xls").valid?.should eq false
+    ActsAsAuthoritah::SpreadsheetReader.new("spec/data/no_such_file.csv").valid?.should eq false
   end
   
   it "should return all valid rows (skip first row and other empty rows)" do
-    reader = ActsAsAuthoritah::SpreadsheetReader.new("spec/data/default.xls")
+    reader = ActsAsAuthoritah::SpreadsheetReader.new("spec/data/default.csv")
     reader.valid_rows.count.should eq 2
   end
   
   it "should returns rows in the expected format" do
-    reader = ActsAsAuthoritah::SpreadsheetReader.new("spec/data/default.xls")
+    reader = ActsAsAuthoritah::SpreadsheetReader.new("spec/data/default.csv")
     reader.valid_rows.should eq [
       ["scope1::scope2", "Dummy", "edit", "test", "x", nil, "x"], 
       ["scope3::scope4", "Another", "update", "test", nil, "x", "x"]
@@ -23,7 +23,7 @@ describe ActsAsAuthoritah::SpreadsheetReader do
   end
   
   it "should return the header row" do
-    reader = ActsAsAuthoritah::SpreadsheetReader.new("spec/data/default.xls")
+    reader = ActsAsAuthoritah::SpreadsheetReader.new("spec/data/default.csv")
     reader.header.should eq ["scope", "controller", "action", "description", "admin", "anonymous", "super_admin"]
   end
 end

data/spec/acts_as_authoritah/spreadsheets/spreadsheet_wrapper_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe ActsAsAuthoritah::SpreadsheetWrapper do
   it "should be able to open a spreadsheet and convert to an array of AccessRules" do
-    ActsAsAuthoritah::SpreadsheetWrapper.new("spec/data/default.xls").to_access_rules.first.class.should eq ActsAsAuthoritah::AccessRule
+    ActsAsAuthoritah::SpreadsheetWrapper.new("spec/data/default.csv").to_access_rules.first.class.should eq ActsAsAuthoritah::AccessRule
   end
   
   it "should load the spreadsheet to ACL correctly" do
-    access_rules = ActsAsAuthoritah::SpreadsheetWrapper.new("spec/data/default.xls").to_access_rules
+    access_rules = ActsAsAuthoritah::SpreadsheetWrapper.new("spec/data/default.csv").to_access_rules
     ActsAsAuthoritah::AccessControlList.new(access_rules).store.should eq({
       "scope1::scope2::DummyController#edit"=>{"admin"=>true, "anonymous"=>false, "super_admin"=>true}, 
       "scope3::scope4::AnotherController#update"=>{"admin"=>false, "anonymous"=>true, "super_admin"=>true}

data/spec/data/archived.csv

@@ -0,0 +1 @@
+scope,controller,action,description,admin,anonymous,super_admin

data/spec/data/default.csv

@@ -0,0 +1 @@
+scope,controller,action,description,admin,anonymous,super_admin

data/spec/data/unpublished.csv

@@ -0,0 +1 @@
+scope,controller,action,description,admin,anonymous,super_admin,,,,,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_authoritah
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152579320 !ruby/object:Gem::Requirement
+  requirement: &2156287840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152579320
+  version_requirements: *2156287840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152578820 !ruby/object:Gem::Requirement
+  requirement: &2156287200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152578820
+  version_requirements: *2156287200
 description: Define user capabilities in your app
 email:
 - unni.tallman@gmail.com
@@ -77,9 +77,9 @@ files:
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_reader_spec.rb
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_row_parser_spec.rb
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_wrapper_spec.rb
-- spec/data/archived.xls
-- spec/data/default.xls
-- spec/data/unpublished.xls
+- spec/data/archived.csv
+- spec/data/default.csv
+- spec/data/unpublished.csv
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -119,7 +119,7 @@ test_files:
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_reader_spec.rb
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_row_parser_spec.rb
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_wrapper_spec.rb
-- spec/data/archived.xls
-- spec/data/default.xls
-- spec/data/unpublished.xls
+- spec/data/archived.csv
+- spec/data/default.csv
+- spec/data/unpublished.csv
 - spec/spec_helper.rb