query_builder 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6be5ac67e82806ac52d166861b2c9d7d4c696d32
-  data.tar.gz: 91dde9df9536a4a21310070bb9b68f8db4e108f6
+  metadata.gz: 314269feed5dfd5be5f4c86914dd836015931c76
+  data.tar.gz: 67ce13340d22a8693caa83693f1f4d5d1ca9cfdd
 SHA512:
-  metadata.gz: c5fd1cb7c24d527384887feb16211b48658830d38178cb16d678d6ad313337a8877f8afd7f7ffa12c6711cc33e815fbfb08f9982f9e8a4b4622701882cfe3988
-  data.tar.gz: 904386933c1267e6612e4f9863ada18a728fabe59b509f198553e1a5370fe8200e54b54ec9bde7333f572fe9879e51b293a5371069e8cd6dd2736d11fe75ce60
+  metadata.gz: 04410e1ec4f1792a257d776f3951820a035b039725bc7d2e33a0610845c6da895bbbea779465015ad3eb364729fb8ca277c40a67cb04abe0db7a2bb434c0d486
+  data.tar.gz: 7d4efce23694c878841a2fefe248a8d2ea11e38a8528e96b6eb11b300cc84e5ed978bde02033681507fb0d37138f1f56a3884a547c395685320b9b27b157e430

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## v0.0.4 2015-09-18
+
+The (backward-compatible) patch fixes a bug in 'SELECT' statement.
+
+### Bugs Fixed
+
+* Fixed 'ORDER BY' condition in 'SELECT' statement (nepalez) with reference to bug report #1 (aq1018)
+
+### Internal
+
+* Extracted `Core::Attributes` to the external gem 'attributes_dsl' (nepalez)
+
+### Deleted
+
+* `Core::Attributes` (nepalez)
+* `Core::AttributesDSL` (nepalez)
+
+[Compare v0.0.3...v0.0.4](https://github.com/nepalez/query_builder/compare/v0.0.3...v0.0.4)
+
 ## v0.0.3 2015-08-21
 
 ### Added

data/lib/query_builder.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require "attributes_dsl"
 require "equalizer"
 require "ice_nine"
 require "transproc"

data/lib/query_builder/core.rb

@@ -8,8 +8,6 @@ module QueryBuilder
   #
   module Core
 
-    require_relative "core/attribute_error"
-    require_relative "core/attribute"
     require_relative "core/base"
     require_relative "core/clause"
     require_relative "core/statement"

data/lib/query_builder/core/base.rb

@@ -10,55 +10,15 @@ module QueryBuilder::Core
   #
   class Base
 
-    # @!method attributes
-    # The hash of default attributes of class' instances
-    #
-    # @return [Hash]
-    #
-    def self.attributes
-      @attributes ||= Set.new
-    end
-
-    # @!method attribute(name, options)
-    # Declares the attribute with optional default value
-    #
-    # @param [Symbol] name The name of the attribute
-    # @param [Hash] options
-    # @option options [Object] :default
-    #
-    # @return [undefined]
-    #
-    def self.attribute(name, options = {})
-      attributes << Attribute.new(name, options)
-      define_method(name) { attributes.fetch(name) }
-    end
-
-    # Makes default attributes inheritable
-    #
-    # @private
-    #
-    def self.inherited(subclass)
-      attributes.each do |item|
-        subclass.public_send(:attribute, *item.arguments)
-      end
-    end
-
-    # @!attribute [r] attributes
-    #
-    # @return [Hash] The hash of the initialized attributes
-    #
-    attr_reader :attributes
+    extend AttributesDSL
 
     # @!method initialize(attributes = {})
     # Initializes the instance
     #
     # @param [Hash] attributes The custom attributes of the instance
     #
-    def initialize(attributes = {})
-      validate_unknown attributes
-      validate_missing attributes
-
-      @attributes = default_attributes.merge(attributes)
+    def initialize(_attributes = {})
+      super
       IceNine.deep_freeze(self)
     end
 
@@ -73,30 +33,6 @@ module QueryBuilder::Core
       ""
     end
 
-    private
-
-    def known_attributes
-      self.class.attributes
-    end
-
-    def required_attributes
-      known_attributes.select(&:required)
-    end
-
-    def default_attributes
-      known_attributes.each_with_object({}) { |e, a| a[e.name] = e.default }
-    end
-
-    def validate_unknown(hash)
-      unknown = hash.keys - known_attributes.map(&:name)
-      fail AttributeError.new(:unknown, unknown) if unknown.any?
-    end
-
-    def validate_missing(hash)
-      missed = required_attributes.map(&:name) - hash.keys
-      fail AttributeError.new(:missed, missed) if missed.any?
-    end
-
   end # class Base
 
 end # module CQLBuiler::Core

data/lib/query_builder/cql/modifiers/order.rb

@@ -38,7 +38,7 @@ module QueryBuilder::CQL
 
         # @private
         def to_s
-          "ORDER BY (#{name} #{desc ? "DESC" : "ASC"})"
+          "ORDER BY #{name} #{desc ? "DESC" : "ASC"}"
         end
 
       end # class Clause

data/lib/query_builder/version.rb

@@ -4,6 +4,6 @@ module QueryBuilder
 
   # The semantic version of the module.
   # @see http://semver.org/ Semantic versioning 2.0
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 
 end # module QueryBuilder

data/query_builder.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9.3"
 
-  gem.add_runtime_dependency "transproc", "~> 0.3"
+  gem.add_runtime_dependency "attributes_dsl", "~> 0.0"
   gem.add_runtime_dependency "equalizer", "~> 0.0.11"
   gem.add_runtime_dependency "ice_nine", "~> 0.11"
+  gem.add_runtime_dependency "transproc", "~> 0.3"
 
   gem.add_development_dependency "hexx-rspec", "~> 0.5"
 

data/spec/integration/select_spec.rb

@@ -40,7 +40,7 @@ describe "SELECT" do
         .allow_filtering
     end
 
-    let(:cql) { "SELECT DISTINCT uuid AS id, name FROM wildlife.species WHERE id >= 3 AND id < 10 AND area IN ('park', 'garden') AND names[1] = 'cat' ORDER BY (name DESC) LIMIT 10 ALLOW FILTERING;" }
+    let(:cql) { "SELECT DISTINCT uuid AS id, name FROM wildlife.species WHERE id >= 3 AND id < 10 AND area IN ('park', 'garden') AND names[1] = 'cat' ORDER BY name DESC LIMIT 10 ALLOW FILTERING;" }
   end
 
 end # describe SELECT

data/spec/unit/core/base_spec.rb

@@ -2,105 +2,36 @@
 
 describe QueryBuilder::Core::Base do
 
-  let(:exception)  { QueryBuilder::Core::AttributeError }
-  let(:klass)      { Class.new(described_class) }
-  let(:instance)   { klass.new(attributes) }
-  let(:attributes) { { foo: :FOO } }
+  let(:klass) { Class.new(described_class) { attribute :foo } }
 
-  describe ".attribute" do
-    shared_examples :adding_attribute do
-      it "updates .attributes" do
-        expect { subject }
-          .to change { klass.attributes.map(&:name) }
-          .from([])
-          .to([:foo])
-      end
-
-      it "adds key to the #attributes" do
-        expect { subject }
-          .to change { klass.new.attributes }
-          .from({})
-          .to(foo: default)
+  describe ".new" do
+    shared_examples :object_constructor do
+      it "[is immutable]" do
+        expect(subject).to be_frozen
       end
 
-      it "defines the instance method" do
-        expect { subject }
-          .to change { klass.instance_methods }
-          .by [:foo]
+      it "[doesn't freeze attributes]" do
+        expect { subject }.not_to change { attributes.frozen? }
       end
 
-      it "makes the method to return the attribute" do
-        subject
-        expect(klass.new.foo).to eql(default)
-        expect(klass.new(foo: :FOO).foo).to eql(:FOO)
+      it "[initializes #attributes]" do
+        expect(subject.attributes).to eql attributes
       end
-    end # shared examples
-
-    it_behaves_like :adding_attribute do
-      subject { klass.attribute :foo }
-      let(:default) { nil }
-    end
-
-    it_behaves_like :adding_attribute do
-      subject { klass.attribute :foo, default: default }
-      let(:default) { :Foo }
     end
-  end # describe .attributes
 
-  describe ".inherited" do
-    subject { Class.new(klass).attributes.map(&:name) }
-
-    let(:klass) do
-      Class.new(described_class) { attribute :foo, default: :FOO }
-    end
-
-    it "inherits the default attibutes of parent class" do
-      expect(subject).to eql [:foo]
+    it_behaves_like :object_constructor do
+      subject { klass.new(attributes) }
+      let(:attributes) { { foo: :FOO } }
     end
-  end # describe .inherited
-
-  describe ".new" do
-    subject { instance }
-
-    before { klass.attribute :foo, required: true }
 
-    it "is immutable" do
-      expect(subject).to be_frozen
-    end
-
-    it "doesn't freeze attributes" do
-      expect { subject }.not_to change { attributes.frozen? }
-    end
-
-    context "with unknown attribute" do
-      let(:attributes) { { foo: :FOO, bar: :BAR } }
-
-      it "raises AttributeError" do
-        expect { subject }.to raise_error do |error|
-          expect(error).to be_kind_of exception
-          expect(error.message).to include "unknown "
-          expect(error.message).to include "bar"
-        end
-      end
-    end
-
-    context "with missed attribute" do
-      before { klass.attribute :bar, required: true }
-
-      it "raises AttributeError" do
-        expect { subject }.to raise_error do |error|
-          expect(error).to be_kind_of exception
-          expect(error.message).to include "missed "
-          expect(error.message).to include "bar"
-        end
-      end
+    it_behaves_like :object_constructor do
+      subject { klass.new }
+      let(:attributes) { { foo: nil } }
     end
   end # describe .new
 
   describe "#to_s" do
-    subject { instance.to_s }
-
-    let(:klass) { Class.new(described_class) { attribute :foo } }
+    subject { klass.new.to_s }
 
     it "returns empty string" do
       expect(subject).to eql("")

data/spec/unit/core/statement_spec.rb

@@ -71,6 +71,10 @@ describe QueryBuilder::Core::Statement do
     context "new clause" do
       subject { statement << qux }
 
+      it "preserves attributes" do
+        expect(subject.attributes).to eql(statement.attributes)
+      end
+
       it "adds the clause" do
         expect(subject.clauses).to eql %w(bar baz qux)
       end
@@ -79,6 +83,10 @@ describe QueryBuilder::Core::Statement do
     context "existing clause" do
       subject { statement << bar }
 
+      it "preserves attributes" do
+        expect(subject.attributes).to eql(statement.attributes)
+      end
+
       it "rewrites the clause" do
         expect(subject.clauses).to eql %w(baz bar)
       end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: query_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: transproc
+  name: attributes_dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: transproc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: hexx-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +115,6 @@ files:
 - config/metrics/yardstick.yml
 - lib/query_builder.rb
 - lib/query_builder/core.rb
-- lib/query_builder/core/attribute.rb
-- lib/query_builder/core/attribute_error.rb
 - lib/query_builder/core/base.rb
 - lib/query_builder/core/clause.rb
 - lib/query_builder/core/statement.rb
@@ -272,8 +284,6 @@ files:
 - spec/integration/update_spec.rb
 - spec/integration/use_spec.rb
 - spec/spec_helper.rb
-- spec/unit/core/attribute_error_spec.rb
-- spec/unit/core/attribute_spec.rb
 - spec/unit/core/base_spec.rb
 - spec/unit/core/clause_spec.rb
 - spec/unit/core/statement_spec.rb
@@ -322,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Builder of the CQL statements.
@@ -369,8 +379,6 @@ test_files:
 - spec/integration/update_spec.rb
 - spec/integration/use_spec.rb
 - spec/spec_helper.rb
-- spec/unit/core/attribute_error_spec.rb
-- spec/unit/core/attribute_spec.rb
 - spec/unit/core/base_spec.rb
 - spec/unit/core/clause_spec.rb
 - spec/unit/core/statement_spec.rb

data/lib/query_builder/core/attribute.rb

@@ -1,54 +0,0 @@
-# encoding: utf-8
-
-module QueryBuilder::Core
-
-  # Describes the attribute of AST node
-  #
-  class Attribute
-
-    include Equalizer.new(:name)
-
-    # @!attribute [r] name
-    #
-    # @return [Symbol] The name of the attribute
-    #
-    attr_reader :name
-
-    # @!attribute [r] default
-    #
-    # @return [Object] The default value for the attribute
-    #
-    attr_reader :default
-
-    # @!attribute [r] required
-    #
-    # @return [Boolean] Whether the attribute is required or not
-    #
-    attr_reader :required
-
-    # Initializes the attribute with name and options
-    #
-    # @param [Symbol] name
-    # @param [Hash] options
-    # @option options [Object] :default The default value for the attribute
-    # @option options [Boolean] :required Whether the attribute is required
-    #
-    def initialize(name, options = {})
-      @name     = name
-      @default  = options[:default]
-      @required = options.fetch(:required) { false }
-
-      IceNine.deep_freeze(self)
-    end
-
-    # Returns arguments of the attribute initializer
-    #
-    # @return [Array]
-    #
-    def arguments
-      [name, default: default, required: required]
-    end
-
-  end # class Attribute
-
-end # module QueryBuilder::Core

data/lib/query_builder/core/attribute_error.rb

@@ -1,25 +0,0 @@
-# encoding: utf-8
-
-module QueryBuilder::Core
-
-  # The exception to be raised by AST nodes' initializers
-  #
-  class AttributeError < KeyError
-
-    # Initializes the error with problem definition and the list of attributes
-    #
-    # @param [#to_s] problem
-    # @param [Array<#to_s>] list
-    #
-    def initialize(problem, list)
-      super [
-        "#{problem} attribute",
-        (list.one? ? ": " : "s: "),
-        list.map { |item| ":#{item}" }.join(", ")
-      ].join
-      IceNine.deep_freeze(self)
-    end
-
-  end # class UndefinedAttributeError
-
-end # module QueryBuilder::Core

data/spec/unit/core/attribute_error_spec.rb

@@ -1,38 +0,0 @@
-# encoding: utf-8
-
-describe QueryBuilder::Core::AttributeError do
-
-  let(:error) { described_class.new(:missed, attributes) }
-  let(:attributes) { [:foo] }
-
-  describe ".new" do
-    subject { error }
-
-    it "is a KeyError" do
-      expect(error).to be_kind_of KeyError
-    end
-
-    it "is immutable" do
-      expect(error).to be_frozen
-    end
-  end # describe .new
-
-  describe "#message" do
-    subject { error.message }
-
-    context "with one attribute" do
-      it "returns proper text" do
-        expect(subject).to eql "missed attribute: :foo"
-      end
-    end # context
-
-    context "with many attributes" do
-      let(:attributes) { [:foo, :bar] }
-
-      it "returns proper text" do
-        expect(subject).to eql "missed attributes: :foo, :bar"
-      end
-    end # context
-  end # describe #message
-
-end # describe QueryBuilder::Core::AttributeError

data/spec/unit/core/attribute_spec.rb

@@ -1,70 +0,0 @@
-# encoding: utf-8
-
-describe QueryBuilder::Core::Attribute do
-
-  let(:attribute) { described_class.new :foo }
-
-  describe ".new" do
-    subject { attribute }
-
-    it "is immutable" do
-      expect(subject).to be_frozen
-    end
-  end # describe .new
-
-  describe "#arguments" do
-    subject { attribute.arguments }
-
-    let(:arguments) { [:foo, default: :FOO, required: true] }
-    let(:attribute) { described_class.new(*arguments) }
-
-    it "returns argumens of the initializer" do
-      expect(subject).to eql(arguments)
-    end
-  end # describe #arguments
-
-  describe "#name" do
-    subject { attribute.name }
-
-    it "is initialized" do
-      expect(subject).to eql(:foo)
-    end
-  end # describe #name
-
-  describe "#default" do
-    subject { attribute.default }
-
-    context "by default" do
-      it "returns nil" do
-        expect(subject).to be_nil
-      end
-    end # context
-
-    context "when value is set" do
-      let(:attribute) { described_class.new :foo, default: :FOO }
-
-      it "is initialized" do
-        expect(subject).to eql(:FOO)
-      end
-    end # context
-  end # describe #default
-
-  describe "#required" do
-    subject { attribute.required }
-
-    context "by default" do
-      it "returns false" do
-        expect(subject).to eql(false)
-      end
-    end # context
-
-    context "when value is set" do
-      let(:attribute) { described_class.new :foo, required: true }
-
-      it "is initialized" do
-        expect(subject).to eql(true)
-      end
-    end # context
-  end # describe #required
-
-end # describe QueryBuilder::Core::Attribute