kitestrings 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa3e59792293fcd2042a36493bb20e8aa9748da
-  data.tar.gz: 41b5a9186fc1b3dd85ff851982b1771431b12849
+  metadata.gz: 9f8cfadafb753d3b207291378f33d28c54544695
+  data.tar.gz: 353789de7071c765b2a09134199761d43b1b2220
 SHA512:
-  metadata.gz: cbe0ce5547d89aa19a7039307fb700f8f33dbae58c7620a0086d6049d4e542bfd18b528d5c411dbcf0746f5f4818525f70276589453ae4368cf051cb5fcbe0b8
-  data.tar.gz: b079c4f4322f18b345050dddcf4e262196de8001e28e6e3180b59b80c6a08f10ce5b4c631d516ed33fa0e0fe8c933219cfcc379d11200c18ff59af18e0fe685b
+  metadata.gz: 8954419b577c34c1e9cf80930521ee623e01a6cd58aec11e7fd87c3b488e5da53ac8555342b1c52ec0f4a329cd14cb726df826201ed9383240451eec757ba1ce
+  data.tar.gz: a9f4038bc92af401e244105262d79bb6b138881c08090612eb542db17fb07363d2017ad86ee0c5dd7d5bcecb713521816188b05a56f27917ed483238a8d3253a

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Version history:
+
+## 1.0.2
+
+* Added FormObject#update to behave like persisted active record model objects.
+
+## 1.0.1
+
+* Removed ActiveRecord::Persitence from FormObject
+
+## 1.0.0
+
+* Initial release

data/kitestrings.gemspec

@@ -6,8 +6,8 @@ require 'kitestrings/version'
 Gem::Specification.new do |spec|
   spec.name          = "kitestrings"
   spec.version       = Kitestrings::VERSION
-  spec.authors       = ["ridget"]
-  spec.email         = ["tom.ridge@tworedkites.com"]
+  spec.authors       = ["ridget", "Matt Connolly"]
+  spec.email         = ["tom.ridge@tworedkites.com", "matt.connolly@tworedkites.com"]
   spec.summary       = %q{For all the 2rk goodness}
   spec.description   = %q{}
   spec.homepage      = ""
@@ -24,5 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.14"
-  spec.add_development_dependency 'generator_spec'
+  spec.add_development_dependency "generator_spec"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "activerecord", ">= 3.2"
 end

data/lib/form_object.rb

@@ -78,6 +78,14 @@ module FormObject
     result
   end
 
+  # implement update as per ActiveRecord::Persistence
+  def update(attrs)
+    assign_attibutes(attrs)
+    save
+  end
+
+  alias update_attributes update
+
   module DelegateEverything
     def method_missing(method, *args, &block)
       if resource.respond_to?(method)

data/lib/kitestrings/version.rb

@@ -1,3 +1,3 @@
 module Kitestrings
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/page_and_sort_helper.rb

@@ -88,11 +88,11 @@ module PageAndSortHelper
             end
       end
 
-      if options[:skip_pagination]
-        scope
-      else
-        # apply kaminari pagination
+      # apply kaminari pagination
+      if scope.respond_to?(:page) && !options[:skip_pagination]
         scope.page(params[:page])
+      else
+        scope
       end
     end
   end

data/spec/lib/page_and_sort_helper_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 require 'page_and_sort_helper'
-require 'active_record'
-
 
 describe PageAndSortHelper do
 
-  # TODO: This spec file needs a test database to talk to. We don't have one set up for this gem yet.
-
   class Record < ActiveRecord::Base
+    def self.order_by_genre(direction)
+      order("CASE genre_id WHEN 1 THEN 2 ELSE 3 END #{direction == :asc ? 'ASC' : 'DESC'}")
+    end
   end
 
   context "page_and_sort" do
@@ -32,15 +31,15 @@ describe PageAndSortHelper do
       let(:params) { {sort: "name", sort_direction: "asc"} }
       it "on Record.scoped" do
         scope = subject.page_and_sort(scope_of(Record))
-        expect(scope.to_sql).to include("ORDER BY `companies`.`name` ASC")
+        expect(scope.to_sql).to include("ORDER BY \"records\".\"name\" ASC")
       end
       it "on Record" do
         scope = subject.page_and_sort(Record)
-        expect(scope.to_sql).to include("ORDER BY `companies`.`name` ASC")
+        expect(scope.to_sql).to include("ORDER BY \"records\".\"name\" ASC")
       end
       it "on Record.where" do
         scope = subject.page_and_sort(Record.where("a = b"))
-        expect(scope.to_sql).to include("ORDER BY `companies`.`name` ASC")
+        expect(scope.to_sql).to include("ORDER BY \"records\".\"name\" ASC")
         expect(scope.to_sql).to include("a = b")
       end
     end
@@ -48,20 +47,20 @@ describe PageAndSortHelper do
       let(:params) { {sort: "name", sort_direction: "desc"} }
       it "on Record.scoped" do
         scope = subject.page_and_sort(scope_of(Record))
-        expect(scope.to_sql).to include("ORDER BY `companies`.`name` DESC")
+        expect(scope.to_sql).to include("ORDER BY \"records\".\"name\" DESC")
       end
       it "on Record" do
         scope = subject.page_and_sort(Record)
-        expect(scope.to_sql).to include("ORDER BY `companies`.`name` DESC")
+        expect(scope.to_sql).to include("ORDER BY \"records\".\"name\" DESC")
       end
       it "on Record.where" do
         scope = subject.page_and_sort(Record.where("a = b"))
-        expect(scope.to_sql).to include("ORDER BY `companies`.`name` DESC")
+        expect(scope.to_sql).to include("ORDER BY \"records\".\"name\" DESC")
         expect(scope.to_sql).to include("a = b")
       end
     end
     context "record sort asc" do
-      let(:params) { {sort: "record_type", sort_direction: "asc"} }
+      let(:params) { {sort: "genre", sort_direction: "asc"} }
       it "on Record.scoped" do
         scope = subject.page_and_sort(scope_of(Record))
         expect(scope.to_sql).to match(/ORDER BY CASE genre_id .* END ASC/)
@@ -77,7 +76,7 @@ describe PageAndSortHelper do
       end
     end
     context "record sort desc" do
-      let(:params) { {sort: "record_type", sort_direction: "desc"} }
+      let(:params) { {sort: "genre", sort_direction: "desc"} }
       it "on Record.scoped" do
         scope = subject.page_and_sort(scope_of(Record))
         expect(scope.to_sql).to match(/ORDER BY CASE genre_id .* END DESC/)

data/spec/spec_helper.rb

@@ -15,3 +15,5 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
+
+Dir["spec/support/**/*.rb"].each { |file| load file }

data/spec/support/active_record.rb

@@ -0,0 +1,13 @@
+require 'active_record'
+
+puts "creating in memory sql lite database"
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+ActiveRecord::Migration.create_table :record do |t|
+  t.string :name
+  t.integer :genre_id
+  t.timestamps
+end
+
+class Record < ActiveRecord::Base
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kitestrings
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - ridget
+- Matt Connolly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,15 +95,45 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  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
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: ''
 email:
 - tom.ridge@tworedkites.com
+- matt.connolly@tworedkites.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -147,6 +178,7 @@ files:
 - spec/lib/page_and_sort_helper_spec.rb
 - spec/lib/size_validator_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_record.rb
 homepage: ''
 licenses:
 - MIT
@@ -179,3 +211,4 @@ test_files:
 - spec/lib/page_and_sort_helper_spec.rb
 - spec/lib/size_validator_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_record.rb