csquery 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e52a544d9ece14775462fc5cacc08be8e4f10f5
-  data.tar.gz: 325e403731957769f74f0b97ee2b0cf020fcac5c
+  metadata.gz: 4445b09e899d09608c7a8c1a5f58d4d39ffdcb19
+  data.tar.gz: a3e064a441ca16b2fc28101973ba7a9330aebe7c
 SHA512:
-  metadata.gz: 264a55240faffa2adbc0c9f0bc7489c51c6f532486ca42eb059efab2d5564a65adcff07f1c3499b14f959e85373a9863920dce6f84a8c1d385d2b812c7358b12
-  data.tar.gz: 60126045b4b5abee10b25066e7bb9a328d70eadae06ef5409154c1a297a68c8e17ebc559f71b11f9a7de787f63c4f67cff783f414cc92e6ef4011a827c994a88
+  metadata.gz: c045cda5e38dbf774e258f0986b992e4ec97764098b0c9111f54b5635489c38d22e0fc07f490e47e5cf1674ec823d9a78914175c0a39a6de76076f2cc962a562
+  data.tar.gz: e7ba4bb72faf160fb3a8c20a1d398584698310068176fc4e9fbca7a69eaf4a4fc055db321f27a1a137c806241a9ec4b270765403bac60cc6291a01bea6412059

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## v0.1.3 (2018-02-01)
+* Quote string values in ranges [#2]
+* Add Csquery::Structured::Builder [#3]

data/README.md

@@ -26,6 +26,22 @@ Or install it yourself as:
 
 ## Usage
 
+```ruby
+builder = Csquery::Structured::Builder.new(:and_) do
+  not_('test', field:'genres')
+
+  or_ do
+    term_('star', field:'title', boost:2)
+    term_('star', field:'plot')
+  end
+end
+
+builder.query
+# => "(and (not field=genres 'test') (or (term field=title boost=2 'star') (term field=plot 'star')))"
+```
+
+You can also build a query manually without the DSL:
+
 ```ruby
 Csquery::Structured.and_(
     Csquery::Structured.not_('test', field:'genres'),
@@ -45,4 +61,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/csquery. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/marcy/csquery. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/csquery.rb

@@ -1,6 +1,8 @@
 require "csquery/version"
 
 require "csquery/structured"
+require "csquery/structured/expression_builder"
+require "csquery/structured/builder"
 
 require "csquery/field_value"
 require "csquery/expression"

data/lib/csquery/structured.rb

@@ -71,8 +71,8 @@ module Csquery
 
       def format_range_values(start_val, end_val = nil)
         start_paren = [nil, ''].include?(start_val) ? '{' : '['
-        start_value = [nil, ''].include?(start_val) ? '' : start_val
-        end_value = [nil, ''].include?(end_val) ? '' : end_val
+        start_value = [nil, ''].include?(start_val) ? '' : format_value(start_val)
+        end_value = [nil, ''].include?(end_val) ? '' : format_value(end_val)
         end_paren = [nil, ''].include?(end_val) ? '}' : ']'
 
         "#{start_paren}#{start_value},#{end_value}#{end_paren}"

data/lib/csquery/structured/builder.rb

@@ -0,0 +1,16 @@
+module Csquery
+  class Structured
+    class Builder < ExpressionBuilder
+      attr_reader :root
+
+      def initialize(root, &block)
+        @root = root
+        super(&block)
+      end
+
+      def query
+        Structured.public_send(root, *expressions).query
+      end
+    end
+  end
+end

data/lib/csquery/structured/expression_builder.rb

@@ -0,0 +1,27 @@
+module Csquery
+  class Structured
+    class ExpressionBuilder
+      attr_reader :expressions
+
+      def initialize(&block)
+        @expressions = []
+        instance_exec(&block) if block_given?
+      end
+
+      def method_missing(m, *args, &block)
+        args = ExpressionBuilder.new(&block).expressions if block_given?
+        @expressions << Structured.public_send(m, *args)
+      end
+
+      def or_concat_(&block)
+        expressions = ExpressionBuilder.new(&block).expressions
+
+        if expressions.length > 1
+          or_(*expressions)
+        else
+          @expressions.concat(expressions)
+        end
+      end
+    end
+  end
+end

data/lib/csquery/version.rb

@@ -1,3 +1,3 @@
 module Csquery
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csquery
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - marcy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -73,6 +74,8 @@ files:
 - lib/csquery/expression.rb
 - lib/csquery/field_value.rb
 - lib/csquery/structured.rb
+- lib/csquery/structured/builder.rb
+- lib/csquery/structured/expression_builder.rb
 - lib/csquery/version.rb
 homepage: https://github.com/marcy/csquery
 licenses: []
@@ -93,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A simple query builder for Amazon Cloudsearch Structured query parser.