active_record-deselect 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 948f3c1f8a00d8623058254e5a5383b56ca42e59
-  data.tar.gz: a1064da89b31313e0101a2f1764538775c376402
+  metadata.gz: 132d754338138de6eb3c65c48fc6a54ccb1d17f2
+  data.tar.gz: 32e39afffbd04a019e87b050c236f7711068502c
 SHA512:
-  metadata.gz: 4b7965e8f1771ca2d692b5735e91c786dd1c5a8777443576f1e4d21d8b2b02383b0f573bf9e3ccaf505e0f1a633c24508ec2f53065628058d231d23c444738ef
-  data.tar.gz: b7ba701e5f781f096785b34bc6bd1057bbf35859108df97d6467dfe372582a4a5b81ac3ae27fa75fd602824f12f140601b004e222c5e39f1094fffafb6e9fee3
+  metadata.gz: b8f22e9c7f5178f3098d548d5e633c278ca4fecc5e4a3d436392137e14732765a01cabb636bd2b160e9b1fefb8a5691e91547e28919fe30e17ecb95365683b6b
+  data.tar.gz: 8e1c15447df029780a2cbb38f1a889057df1fb50d001e0818c9a6da9e023fa03c11182c14d05ce0bc7622d7909283bffbf1a612cacf7bd2f584419dca564d22b

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+script: bundle exec rspec
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/README.md

@@ -1,6 +1,8 @@
-# ActiveRecordDeselect
+[![Build Status](https://travis-ci.org/fukayatsu/active_record-deselect.png?branch=master)](https://travis-ci.org/fukayatsu/active_record-deselect)
 
-Adds deselect logic to ActiveRecord
+# ActiveRecord::Deselect
+
+Adds deselect logic to ActiveRecord.
 
 ## Installation
 
@@ -19,17 +21,37 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-Post.column_names
-# => ["id", "name", "body"]
-
-Post.select(:id, :name, :body).deselect(:id, :name).select_values
-# => [:body]
+4.0.2 @ 2.0.0 (main)>Post
+#=> class Post < ActiveRecord::Base {
+              :id => :integer,
+            :name => :string,
+            :body => :text,
+         :user_id => :integer,
+    :published_at => :datetime,
+      :created_at => :datetime,
+      :updated_at => :datetime
+}
+
+4.0.2 @ 2.0.0 (main)>Post.deselect(:body).to_sql
+#=> "SELECT id, name, user_id, published_at, created_at, updated_at FROM \"posts\""
+
+4.0.2 @ 2.0.0 (main)>Post.select(:id, :name, :body, :user_id).deselect(:body, "user_id").to_sql
+#=> "SELECT id, name FROM \"posts\""
+
+4.0.2 @ 2.0.0 (main)>Post.select('posts.id', 'posts.name').deselect(:name).to_sql
+#=> "SELECT posts.id FROM \"posts\""
+
+4.0.2 @ 2.0.0 (main)>Post.select(:id).deselect(:id).to_sql
+#=> "SELECT \"posts\".* FROM \"posts\""
+```
 
-Post.all.deselect(:id).select_values
-# => [:name, :body]
+### deselect!
 
-Post.deselect(:id).select_values
-# => [:name, :body]
+```ruby
+posts = Post.select(:id, :name)
+posts.deselect!(:name)
+posts.to_sql
+#=> "SELECT id FROM \"posts\""
 ```
 
 ## Contributing

data/lib/active_record/deselect.rb

@@ -2,18 +2,31 @@ require "active_record/deselect/version"
 
 module ActiveRecord
   module Deselect
-    def deselect(*columns)
-      s = current_scope || relation
+    def deselect(*deselect_columns)
+      scope = current_scope || relation
+      select_columns = filter_columns(scope, deselect_columns)
+      scope.except(:select).select(select_columns)
+    end
+
+    def deselect!(*deselect_columns)
+      scope = current_scope || relation
+      select_columns = filter_columns(scope, deselect_columns)
+      scope.select_values = select_columns
+      scope
+    end
+
+  private
 
-      select_columns = (s.select_values.presence || column_names.map(&:to_sym)) -
-        columns.map{ |column|
-          column = column.to_s
-          column.include?('.') ? [column] : [column, "#{table_name}.#{column}"]
-        }.flatten.map{ |column|
-          [column.to_s, column.to_sym]
-        }.flatten
+    def filter_columns(scope, deselect_columns)
+      current_columns  = scope.select_values.presence || column_names.map(&:to_sym)
+      deselect_columns = deselect_columns.map{ |column|
+        column = column.to_s
+        column.include?('.') ? [column] : [column, "#{table_name}.#{column}"]
+      }.flatten.map{ |column|
+        [column.to_s, column.to_sym]
+      }.flatten
 
-      s.except(:select).select(select_columns)
+      current_columns - deselect_columns
     end
   end
 end

data/lib/active_record/deselect/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Deselect
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/active_record/deselect_spec.rb

@@ -21,6 +21,7 @@ describe ActiveRecord::Deselect do
 
       context "with String" do
         it { expect(Post.select('id', :name, :body).deselect(:id, :name).select_values).to eq([:body]) }
+        it { expect(Post.select(:id, :name, :body).deselect('id', :name).select_values).to eq([:body]) }
       end
 
       context "with tablename" do
@@ -42,5 +43,21 @@ describe ActiveRecord::Deselect do
     context "with where" do
       it { expect(Post.where(id: 1).deselect(:id).select_values).to eq([:name, :body]) }
     end
+
+    context "chain" do
+      it {
+        posts = Post.select(:id, :name, :body).deselect(:name)
+        posts.deselect(:body) # not deselect!
+        expect(posts.select_values).to eq([:id, :body])
+      }
+    end
+  end
+
+  describe '#deselect!' do
+    it 'deselect name from current scope' do
+      posts = Post.select(:id, :name)
+      posts.deselect!(:name)
+      expect(posts.select_values).to eq([:id])
+    end
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: active_record-deselect
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: 3.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: pry
   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
   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: Adds deselect logic to ActiveRecord
@@ -101,8 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -122,17 +123,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Adds deselect logic to ActiveRecord