rusql 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca832a09fdf83cd1c64656927c8c556aa434b95
-  data.tar.gz: d87e61a4e1dd20c0cc6e945ca72ea1de0d1c1088
+  metadata.gz: 1ff1b4a10ef306cabe203f2af5da46b99e11b1f6
+  data.tar.gz: cece6f6999111a263632519870d48bd54f9d3a63
 SHA512:
-  metadata.gz: 7b9101f8172c1283da78d13c712e9fdc2663f836af9841a66789e1e8e443a398f71b7c639a551aea118735bb1d76341668ac9c8f5fe77ab03ba6e3f0719f0cd0
-  data.tar.gz: 60a2f17ea4aabdb96d789d32e7fb7c2209061098a2f76c5c7c9ef2246bcb1c6e0b179708dc769da3d3501607bd5f70c91f7879a5b29ade2e175aba8a253bd9fd
+  metadata.gz: dfd7287e5e4040c15ba79c2ce96d259b722b7825c3604b4dace91f95fa9c627958186571416cbd4ccf04bd36bb43efd26b4b801d2d0f02469d151acae331be46
+  data.tar.gz: 9ffb4d54d0cae07c5de2f8cdd67380fc46b4559a6b217cdf4ff6f0e836b9300ab83808ce32b1d140ae35eeb3e902129c1e129699e89222c34d42c6ce69cd5214

data/lib/rusql/basic_condition.rb

@@ -23,7 +23,7 @@ module Rusql
     end
 
     def and(condition)
-      raise Exception.new(Condition, condition.class) unless condition.is_a?(Condition)
+      raise TypeException.new(Condition, condition.class) unless condition.is_a?(Condition)
 
       c = ComplexCondition.new
       c.type = :and
@@ -33,7 +33,18 @@ module Rusql
       c
     end
 
-    def to_s(indent: " ") # to make it compatible with complex condition to_s
+    def or(condition)
+      raise TypeException.new(Condition, condition.class) unless condition.is_a?(Condition)
+
+      c = ComplexCondition.new
+      c.type = :or
+      c.add_condition(self)
+      c.add_condition(condition)
+
+      c
+    end
+
+    def to_s(indent_level: 1) # to make it compatible with complex condition to_s
       case self.type
       when :equals
         "#{left.to_s} = #{convert_value(self.right)}"

data/lib/rusql/complex_condition.rb

@@ -56,8 +56,10 @@ module Rusql
       new_condition
     end
 
-    def to_s(indent: "  ")
-      self.conditions.map{ |c| c.to_s(indent: indent+"  ") }.join("\n#{indent}#{self.type.to_s.upcase} ")
+    def to_s(indent_level: 1)
+      indent = "  "*indent_level
+      indent_out = "  "*(indent_level-1)
+      "(\n" + indent + self.conditions.map{ |c| c.to_s(indent_level: indent_level+1) }.join("\n#{indent}#{self.type.to_s.upcase} ") + "\n#{indent_out})"
     end
   end
 end

data/lib/rusql/query.rb

@@ -113,7 +113,7 @@ module Rusql
         where_part += " "
         where_part += @condition.to_s
       elsif @condition.is_a?(ComplexCondition)
-        where_part += "\n  "
+        where_part += " "
         where_part += @condition.to_s
       end
 

data/lib/rusql/version.rb

@@ -1,3 +1,3 @@
 module Rusql
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rusql
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ajith Hussain
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler