datagrid 1.2.0 → 1.2.1

data/spec/datagrid/ordering_spec.rb

@@ -9,74 +9,74 @@ describe Datagrid::Ordering do
 
 
   it "should support order" do
-    test_report(:order => "name") do
+    expect(test_report(:order => "name") do
       scope do
         Entry
       end
       column :name
-    end.assets.should == [first, second, third]
+    end.assets).to eq([first, second, third])
 
   end
 
   it "should support desc order" do
-    test_report(:order => "name", :descending => true) do
+    expect(test_report(:order => "name", :descending => true) do
       scope do
         Entry
       end
       column :name
-    end.assets.should == [third, second, first]
+    end.assets).to eq([third, second, first])
   end
 
 
   it "should raise error if ordered by not existing column" do
-    lambda {
+    expect {
       test_report(:order => :hello)
-    }.should raise_error(Datagrid::OrderUnsupported)
+    }.to raise_error(Datagrid::OrderUnsupported)
   end
 
   it "should raise error if ordered by column without order" do
-    lambda do
+    expect do
       test_report(:order => :category) do
         filter(:category, :default, :order => false) do |value|
           self
         end
       end
-    end.should raise_error(Datagrid::OrderUnsupported)
+    end.to raise_error(Datagrid::OrderUnsupported)
   end
 
   it "should override default order" do
-    test_report(:order => :name) do
+    expect(test_report(:order => :name) do
       scope { Entry.order("name desc")}
       column(:name, :order => "name asc")
-    end.assets.should == [first, second, third]
+    end.assets).to eq([first, second, third])
   end
 
   it "should support order given as block" do
-    test_report(:order => :name) do
+    expect(test_report(:order => :name) do
       scope { Entry }
       column(:name, :order => proc { order("name desc") })
-    end.assets.should == [third, second, first]
+    end.assets).to eq([third, second, first])
   end
 
   it "should support reversing order given as block" do
-    test_report(:order => :name, :descending => true) do
+    expect(test_report(:order => :name, :descending => true) do
       scope { Entry }
       column(:name, :order => proc { order("name desc") })
-    end.assets.should == [first, second, third]
+    end.assets).to eq([first, second, third])
   end
 
   it "should support order desc given as block" do
-    test_report(:order => :name, :descending => true) do
+    expect(test_report(:order => :name, :descending => true) do
       scope { Entry }
       column(:name,  :order_desc => proc { order("name desc")})
-    end.assets.should == [third, second, first]
+    end.assets).to eq([third, second, first])
   end
 
   it "should treat true order as default" do
-    test_report(:order => :name) do
+    expect(test_report(:order => :name) do
       scope { Entry }
       column(:name,  :order => true)
-    end.assets.should == [first, second, third]
+    end.assets).to eq([first, second, third])
   end
 
   it "should support order_by_value" do
@@ -86,9 +86,9 @@ describe Datagrid::Ordering do
         name
       end
     end
-    report.assets.should == [first, second, third]
+    expect(report.assets).to eq([first, second, third])
     report.descending = true
-    report.assets.should == [third, second, first]
+    expect(report.assets).to eq([third, second, first])
   end
 
   it "should support order_by_value as block" do
@@ -101,9 +101,9 @@ describe Datagrid::Ordering do
         name
       end
     end
-    report.assets.should == [third, first, second]
+    expect(report.assets).to eq([third, first, second])
     report.descending = true
-    report.assets.should == [second, first, third]
+    expect(report.assets).to eq([second, first, third])
   end
 
 end

data/spec/datagrid/scaffold_spec.rb

@@ -5,13 +5,13 @@ describe Datagrid::Scaffold do
 
   describe '.paginate_code' do
     it 'should fall through options successfully' do
-      subject.paginate_code.should eql('paginate_somehow')
+      expect(subject.paginate_code).to eql('paginate_somehow')
     end
   end
 
   describe '.pagination_helper_code' do
     it 'should fall through options successfully' do
-      subject.pagination_helper_code.should eql('some_pagination_helper(@assets)')
+      expect(subject.pagination_helper_code).to eql('some_pagination_helper(@assets)')
     end
   end
 end

data/spec/datagrid/utils_spec.rb

@@ -6,13 +6,13 @@ describe Datagrid::Utils do
   describe ".warn_once" do
     it "should work" do
       silence_warnings do
-        Datagrid::Utils.warn_once("hello", 0.2).should be_true
+        expect(Datagrid::Utils.warn_once("hello", 0.2)).to be_true
       end
       sleep(0.1)
-      Datagrid::Utils.warn_once("hello", 0.2).should be_false
+      expect(Datagrid::Utils.warn_once("hello", 0.2)).to be_false
       sleep(0.2)
       silence_warnings do
-        Datagrid::Utils.warn_once("hello", 0.2).should be_true
+        expect(Datagrid::Utils.warn_once("hello", 0.2)).to be_true
       end
     end
   end

data/spec/datagrid_spec.rb

@@ -22,12 +22,15 @@ describe SimpleReport do
     :group => group, :name => "Star", :disabled => false, :confirmed => false, :category => "first"
   ) }
 
-  its(:assets) { should include(entry) }
+  describe '#assets' do
+    subject { super().assets }
+    it { should include(entry) }
+  end
 
   describe ".attributes" do
     it "should return report attributes" do
       (subject.filters.map(&:name) + [:order, :descending]).each do |attribute|
-        subject.attributes.should have_key(attribute)
+        expect(subject.attributes).to have_key(attribute)
       end
     end
 
@@ -35,7 +38,7 @@ describe SimpleReport do
 
   describe ".scope" do
     it "should return defined scope of objects" do
-      subject.scope.should respond_to(:each)
+      expect(subject.scope).to respond_to(:each)
     end
       
 
@@ -45,9 +48,9 @@ describe SimpleReport do
       end
 
       it "should raise ConfigurationError" do
-        lambda {
+        expect {
           subject.scope
-        }.should raise_error(Datagrid::ConfigurationError)
+        }.to raise_error(Datagrid::ConfigurationError)
 
       end
     end
@@ -56,7 +59,7 @@ describe SimpleReport do
   describe ".batch_size" do
     context "when not defined on class level" do
       it "returns nil" do
-        subject.batch_size.should == nil
+        expect(subject.batch_size).to eq(nil)
       end
     end
 
@@ -68,7 +71,7 @@ describe SimpleReport do
       end
 
       it "returns the configured batch size" do
-        subject.batch_size.should == 25
+        expect(subject.batch_size).to eq(25)
       end
     end
 

data/spec/support/matchers.rb

@@ -11,15 +11,18 @@ end
 class EqualToDom
 
   def initialize(expectation)
-    @expectation = Nokogiri::HTML::DocumentFragment.parse(force_encoding(expectation).strip).to_s
+    @expectation = normalize(expectation)
   end
 
   def matches?(text)
-
-    @matcher = Nokogiri::HTML::DocumentFragment.parse(force_encoding(text).strip).to_s
+    @matcher = normalize(text)
     @matcher == @expectation
   end
 
+  def normalize(text)
+    Nokogiri::HTML::DocumentFragment.parse(force_encoding(text.split("\n").map(&:strip).join(""))).to_s
+  end
+
   def failure_message
     "Expected dom \n#{@matcher}\n to match \n#{@expectation}\n, but it wasn't"
   end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -154,14 +154,14 @@ dependencies:
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
@@ -196,14 +196,14 @@ dependencies:
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This allows you to easily build datagrid aka data tables with sortable
@@ -214,9 +214,9 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 files:
-- ".document"
-- ".rspec"
-- ".travis.yml"
+- .document
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - Rakefile
@@ -320,12 +320,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []