querybuilder 1.1.4 → 1.2.1

data/History.txt

@@ -1,3 +1,15 @@
+== 1.2.1 2013-03-11
+
+* Major enhancement
+  * "add_table" takes a block to configure join clause.
+  * Fixed count queries with group and having clauses.
+
+== 1.2.0 2012-10-10
+
+* Major enhancement
+  * All relations now use INNER JOIN with ON clause instead of using the WHERE filter. Custom processors *MUST*
+    be changed to use the new add_table with :inner join type instead of using where filters.
+
 == 1.1.4 2012-10-07
 
 * Major enhancement

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '1.1.4'
-end
+  VERSION = '1.2.1'
+end

data/lib/query_builder/processor.rb

@@ -792,13 +792,15 @@ module QueryBuilder
 
       # Add a new table and apply scoping when needed
       def add_table(use_name, table_name = nil, type = nil, &block)
+        if use_name == main_table && first?
+          # we are now using final table
+          context[:table_alias] = use_name
+          avoid_alias = true
+        else
+          avoid_alias = false
+        end
+
         if use_name == main_table
-          if first?
-            # we are now using final table
-            context[:table_alias] = use_name
-            avoid_alias = true
-          end
-          
           if context[:scope_type] == :join
             context[:scope_type] = nil
             # pre scope
@@ -806,12 +808,14 @@ module QueryBuilder
               @query.add_table(main_table, main_table, avoid_alias)
               apply_scope(context[:scope])
             end
+            
             @query.add_table(use_name, table_name, avoid_alias, type, &block)
           elsif context[:scope_type] == :filter
             context[:scope_type] = nil
             # post scope
-            @query.add_table(use_name, table_name, avoid_alias)
+            tbl = @query.add_table(use_name, table_name, avoid_alias, &block)
             apply_scope(context[:scope] || default_scope(context))
+            tbl
           else
             # scope already applied / skip
             @query.add_table(use_name, table_name, avoid_alias, type, &block)

data/lib/query_builder/query.rb

@@ -3,7 +3,7 @@ require 'active_record'
 module QueryBuilder
   class Query
     SELECT_WITH_TYPE_REGEX = /^(.*):(.*)$/
-    attr_accessor :processor_class, :distinct, :select, :tables, :table_alias, :where,
+    attr_accessor :processor_class, :distinct, :select, :tables, :table_alias, :unique_alias, :where,
                   :limit, :offset, :page_size, :order, :group, :error, :attributes_alias,
                   :pagination_key, :main_class, :context, :key_value_tables, :having, :types
 
@@ -16,8 +16,9 @@ module QueryBuilder
     def initialize(processor_class)
       @processor_class = processor_class
       @tables = []
-      @table_alias = {}
-      @join_tables = {}
+      @table_alias  = {}
+      @unique_alias = {}
+      @join_tables  = {}
       @needed_join_tables = {}
       @attributes_alias   = {}
       # Custom select foo as bar:time or 'types:' field in custom query.
@@ -131,12 +132,12 @@ module QueryBuilder
       key_table = (key_tables[use_name] ||= {})
       if alias_table = key_table[key]
         # done, the index_table has been used for the given key in the current context
+        alias_table
       else
         # insert the new table
-        add_table(use_name, index_table, false, :left, &block)
-        alias_table = key_table[key] = table(use_name)
+        # Let caller configure the filter with &block.
+        key_table[key] = add_table(use_name + "_#{key}", index_table, false, :left, &block)
       end
-      alias_table
     end
 
     def add_select(field, fname)
@@ -177,7 +178,7 @@ module QueryBuilder
     # Duplicate query, avoiding sharing some arrays and hash
     def dup
       other = super
-      %w{tables table_alias where tables key_value_tables}.each do |k|
+      %w{tables table_alias unique_alias where tables key_value_tables}.each do |k|
         other.send("#{k}=", other.send(k).dup)
       end
       other
@@ -223,56 +224,63 @@ module QueryBuilder
     def quote_column_name(name)
       connection.quote_column_name(name)
     end
-    
-    def has_table?(use_name)
-      !@table_alias[use_name].nil?
-    end
-    
-    
+
     private
-      # Make sure each used table gets a unique name. By default, this uses an alias
-      # But if 'avoid_alias' is true and it is the first call for this table, return the
-      # table without an alias.
+      # Make sure each used table gets a unique name
       def get_alias(use_name, table_name = nil, avoid_alias = true)
         table_name ||= use_name
-        list = (@table_alias[use_name] ||= [])
-        if avoid_alias && !list.include?(use_name)
+
+        base = use_name[0..1]
+        list  = (@unique_alias[base] ||= [])
+        list2 = @table_alias[use_name] ||= []
+        if avoid_alias && !@tables.include?(table_name)
           alias_name = use_name
         elsif @tables.include?(use_name)
           # links, li1, li2, li3
-          alias_name = "#{use_name[0..1]}#{list.size}"
+          alias_name = "#{base}#{list.size}"
         else
           # ob1, obj2, objects
-          alias_name = "#{use_name[0..1]}#{list.size + 1}"
+          alias_name = "#{base}#{list.size + 1}"
         end
 
-        list << alias_name
+        # We add to both because @table_alias[use_name] is used in table(use_name)
+        # and @table_alias[use_name]
+        list  << alias_name
+        list2 << alias_name
         alias_name
       end
 
       def add_alias_to_tables(table_name, alias_name, type = nil, &block)
+        if block_given?
+          on_clause = "#{block.call(alias_name)}"
+        end
+        
         if type
           key = "#{table_name}=#{type}=#{alias_name}"
-          
           @needed_join_tables[key] ||= begin
-            clause = "#{type.to_s.upcase} JOIN #{table_name}"
-            if alias_name && alias_name != table_name
-              clause << " AS #{alias_name}"
-            end
-            if block_given?
-              clause << " ON #{block.call(alias_name || table_name)}"
-            end
+            table_name = "#{type.to_s.upcase} JOIN #{table_name}"
             joins = (@join_tables[main_table] ||= [])
-            joins << clause
+            on_clause = on_clause ? " ON #{on_clause}" : ''
+            joins << (alias_name ? "#{table_name} AS #{alias_name}#{on_clause}" : "#{table_name}#{on_clause}")
           end
-          return
+          return alias_name
+        end
+        
+        if on_clause && @tables.empty?
+          # NO JOIN
+          @where << on_clause
+          on_clause = ''
+        elsif on_clause
+          on_clause = " ON #{on_clause}"
         end
         
         if alias_name != table_name
-          @tables << "#{table_name} AS #{alias_name}"
+          @tables << "#{table_name} AS #{alias_name}#{on_clause}"
         else
-          @tables << table_name
+          @tables << "#{table_name}#{on_clause}"
         end
+        
+        alias_name
       end
 
       def build_statement(type = :find)
@@ -314,7 +322,7 @@ module QueryBuilder
           end
         end
 
-        "SELECT#{distinct} #{(@select || ["#{main_table}.*"]).join(',')} FROM #{table_list.flatten.sort.join(',')}" + (@where == [] ? '' : " WHERE #{filter}") + group.to_s + @having.to_s + @order.to_s + @limit.to_s + @offset.to_s
+        "SELECT#{distinct} #{(@select || ["#{main_table}.*"]).join(',')} FROM #{table_list.flatten.sort.join(' JOIN ')}" + (@where == [] ? '' : " WHERE #{filter}") + group.to_s + @having.to_s + @order.to_s + @limit.to_s + @offset.to_s
       end
 
       def count_statement
@@ -338,7 +346,13 @@ module QueryBuilder
           count_on = "COUNT(*)"
         end
 
-        "SELECT #{count_on} FROM #{table_list.flatten.sort.join(',')}" + (@where == [] ? '' : " WHERE #{filter}")
+        sql = "SELECT #{count_on} FROM #{table_list.flatten.sort.join(' JOIN ')}" + (@where == [] ? '' : " WHERE #{filter}")
+        if @having then
+          # We need the group clause in case the query uses MIN or MAX.
+          sql = "SELECT COUNT(*) FROM (#{sql}#{@group}#{@having}) AS BASE"
+        end
+
+        sql
       end
 
       def get_connection

data/querybuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "1.1.4"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2012-10-10}
+  s.date = %q{2013-03-11}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 

data/test/querybuilder/basic.yml

@@ -16,8 +16,8 @@ objects_in_site:
 
 recipients:
   sxp: '[:query, [:relation, "recipients"]]'
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, id]"
-  sql: "SELECT objects.* FROM links,objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = 123"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, id]"
+  sql: "SELECT objects.* FROM links JOIN objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = 123"
 
 letters_in_project:
   sxp: '[:query, [:scope, [:relation, "letters"], "project"]]'
@@ -33,7 +33,7 @@ order_single_table:
 
 order_many_tables:
   src: "recipients order by name"
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? ORDER BY objects.name}, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? ORDER BY objects.name}, id]"
 
 order_many_params:
   src: "objects in project order by name, id desc"
@@ -70,12 +70,12 @@ paginate:
 recipients_or_objects:
   src: recipients or objects
   sxp: '[:query, [:clause_or, [:relation, "recipients"], [:relation, "objects"]]]'
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (objects.parent_id = ? AND links.id = 0)) GROUP BY objects.id}, id, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (objects.parent_id = ? AND links.id = 0)) GROUP BY objects.id}, id, id]"
 
 recipients_or_objects_or_letters:
   src: recipients or objects or letters
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (links.id = 0 AND objects.parent_id = ?) OR (links.id = 0 AND objects.kpath LIKE 'NNL%' AND objects.parent_id = ?)) GROUP BY objects.id}, id, id, id]"
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (objects.parent_id = ? AND links.id = 0) OR (objects.kpath LIKE 'NNL%' AND objects.parent_id = ? AND links.id = 0)) GROUP BY objects.id}, id, id, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (links.id = 0 AND objects.parent_id = ?) OR (links.id = 0 AND objects.kpath LIKE 'NNL%' AND objects.parent_id = ?)) GROUP BY objects.id}, id, id, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (objects.parent_id = ? AND links.id = 0) OR (objects.kpath LIKE 'NNL%' AND objects.parent_id = ? AND links.id = 0)) GROUP BY objects.id}, id, id, id]"
 
 or_clause_with_filter:
   src: "(recipients where name = 'foo') or objects"

data/test/querybuilder/custom.yml

@@ -41,13 +41,13 @@ it_should_not_use_the_first_table_as_main:
   context:
     custom_query_group: test
   src: "two_table where x = '4' and name like 'b%'"
-  res: "%Q{SELECT x AS x,IF(table_one.y,table_one.y,table_two.z) AS y,table_two.name FROM table_one,table_two WHERE (x) = '4' AND table_one.name LIKE 'b%'}"
+  res: "%Q{SELECT x AS x,IF(table_one.y,table_one.y,table_two.z) AS y,table_two.name FROM table_one JOIN table_two WHERE (x) = '4' AND table_one.name LIKE 'b%'}"
 
 it_should_use_main_table_as_main:
   context:
     custom_query_group: test
   src: "two_table_main where name = '4'"
-  res: "%Q{SELECT x FROM foo,table_one,table_two WHERE foo.name = '4'}"
+  res: "%Q{SELECT x FROM foo JOIN table_one JOIN table_two WHERE foo.name = '4'}"
 
 it_should_limit_the_entries:
   context:

data/test/querybuilder/filters.yml

@@ -15,15 +15,15 @@ not_equal_alt:
   
 recipients_where_kpath:
   src: "recipients where kpath like 'NRCC%'"
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.kpath LIKE 'NRCC%' AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE objects.kpath LIKE 'NRCC%' AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, id]"
 
 hand_made_class_filter:
   src: "recipients where kpath like 'NRCC%'"
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.kpath LIKE 'NRCC%' AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE objects.kpath LIKE 'NRCC%' AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, id]"
 
 better_class_filter:
   src: "recipients where class = 'Client'"
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.kpath LIKE ? AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, \"NRCC%\", id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE objects.kpath LIKE ? AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, \"NRCC%\", id]"
 
 like_filter_with_scope:
   src: "letters where name like 'a%' in site"
@@ -41,7 +41,7 @@ letters_group_by_name:
 
 recipients_group_by_name:
   sxp: '[:query, [:group, [:relation, "recipients"], [:field, "name"]]]'
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.name}, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.name}, id]"
 
 custom_query_having:
   context:

data/test/querybuilder/having.yml

@@ -5,4 +5,4 @@ simple:
 
 having_order:
   src: "recipients from letters select amount.sum as tot_amount group by id having tot_amount > 2000"
-  res: "[%Q{SELECT objects.*,SUM(ob1.amount) AS \"tot_amount\" FROM links,objects,objects AS ob1 WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ob1.id AND ob1.kpath LIKE 'NNL%' AND ob1.parent_id = ? GROUP BY objects.id HAVING \"tot_amount\" > 2000}, id]"
+  res: "[%Q{SELECT objects.*,SUM(ob1.amount) AS \"tot_amount\" FROM links JOIN objects JOIN objects AS ob1 WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ob1.id AND ob1.kpath LIKE 'NNL%' AND ob1.parent_id = ? GROUP BY objects.id HAVING \"tot_amount\" > 2000}, id]"

data/test/querybuilder/joins.yml

@@ -1,23 +1,23 @@
 
 icons_from_recipients:
   sxp: '[:query, [:from, [:relation, "icons"], [:relation, "recipients"]]]'
-  res: "[%Q{SELECT objects.* FROM links,links AS li1,objects,objects AS ob1 WHERE objects.id = li1.source_id AND li1.relation_id = 5 AND li1.target_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN links AS li1 JOIN objects JOIN objects AS ob1 WHERE objects.id = li1.source_id AND li1.relation_id = 5 AND li1.target_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
 
 icons_from_recipients_from_letters:
   sxp: '[:query, [:from, [:from, [:relation, "icons"], [:relation, "recipients"]], [:relation, "letters"]]]'
 
 letters_from_recipients:
-  res: "[%Q{SELECT objects.* FROM links,objects,objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.parent_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects JOIN objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.parent_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
 
 objects_from_recipients:
-  res: "[%Q{SELECT objects.* FROM links,objects,objects AS ob1 WHERE objects.parent_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
+  res: "[%Q{SELECT objects.* FROM links JOIN objects JOIN objects AS ob1 WHERE objects.parent_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
 
 parent_from_parent:
   sxp: '[:query, [:from, [:relation, "parent"], [:relation, "parent"]]]'
-  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.id = ob1.parent_id AND ob1.id = ? GROUP BY objects.id}, parent_id]"
+  res: "[%Q{SELECT objects.* FROM objects JOIN objects AS ob1 WHERE objects.id = ob1.parent_id AND ob1.id = ? GROUP BY objects.id}, parent_id]"
 
 children_from_objects_in_project:
-  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.parent_id = ob1.id AND ob1.project_id = ? GROUP BY objects.id}, project_id]"
+  res: "[%Q{SELECT objects.* FROM objects JOIN objects AS ob1 WHERE objects.parent_id = ob1.id AND ob1.project_id = ? GROUP BY objects.id}, project_id]"
 
 tags:
   sxp: '[:query, [:relation, "tags"]]'
@@ -34,9 +34,9 @@ complex_from_with_scopes_and_typed_scope:
 
 letters_in_project_from_letters:
   sxp: '[:query, [:from, [:scope, [:relation, "letters"], "project"], [:relation, "letters"]]]'
-  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.project_id = ob1.id AND ob1.kpath LIKE 'NNL%' AND ob1.parent_id = ? GROUP BY objects.id}, id]"
+  res: "[%Q{SELECT objects.* FROM objects JOIN objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.project_id = ob1.id AND ob1.kpath LIKE 'NNL%' AND ob1.parent_id = ? GROUP BY objects.id}, id]"
 
 letters_in_project_from_letters_group_by:
   src: "letters in project from letters group by name,id"
   sxp: '[:query, [:group, [:from, [:scope, [:relation, "letters"], "project"], [:relation, "letters"]], [:field, "name"], [:field, "id"]]]'
-  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.project_id = ob1.id AND ob1.kpath LIKE 'NNL%' AND ob1.parent_id = ? GROUP BY objects.name, objects.id}, id]"
+  res: "[%Q{SELECT objects.* FROM objects JOIN objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.project_id = ob1.id AND ob1.kpath LIKE 'NNL%' AND ob1.parent_id = ? GROUP BY objects.name, objects.id}, id]"

data/test/querybuilder/mixed.yml

@@ -1,14 +1,14 @@
 users_from_objects:
   sxp: '[:query, [:from, [:relation, "users"], [:relation, "objects"]]]'
-  res: "TestUser: [%Q{SELECT users.* FROM objects AS ob1,users WHERE users.node_id = ob1.id AND ob1.parent_id = ? GROUP BY users.id ORDER BY users.name ASC, users.first_name ASC}, id]"
+  res: "TestUser: [%Q{SELECT users.* FROM objects AS ob1 JOIN users WHERE users.node_id = ob1.id AND ob1.parent_id = ? GROUP BY users.id ORDER BY users.name ASC, users.first_name ASC}, id]"
 
 users_where_name_from_objects:
   src: "users where name eq 'bob' from objects"
-  res: "TestUser: [%Q{SELECT users.* FROM objects AS ob1,users WHERE users.name = 'bob' AND users.node_id = ob1.id AND ob1.parent_id = ? GROUP BY users.id ORDER BY users.name ASC, users.first_name ASC}, id]"
+  res: "TestUser: [%Q{SELECT users.* FROM objects AS ob1 JOIN users WHERE users.name = 'bob' AND users.node_id = ob1.id AND ob1.parent_id = ? GROUP BY users.id ORDER BY users.name ASC, users.first_name ASC}, id]"
   
 objects_from_users_from_objects:
   src: "objects from users where name = 'foo' from objects where event_at > REF_DATE order by event_at asc"
-  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1,users AS us1 WHERE objects.id = us1.node_id AND us1.name = 'foo' AND us1.node_id = ob1.id AND ob1.event_at > now() AND ob1.parent_id = ? GROUP BY objects.id ORDER BY objects.event_at ASC}, id]"
+  res: "[%Q{SELECT objects.* FROM objects JOIN objects AS ob1 JOIN users AS us1 WHERE objects.id = us1.node_id AND us1.name = 'foo' AND us1.node_id = ob1.id AND ob1.event_at > now() AND ob1.parent_id = ? GROUP BY objects.id ORDER BY objects.event_at ASC}, id]"
 
 users:
   res: "TestUser: [%Q{SELECT users.* FROM users WHERE users.node_id = ? ORDER BY users.name ASC, users.first_name ASC}, id]"

data/test/querybuilder_test.rb

@@ -39,7 +39,7 @@ class DummyQueryBuilder < Test::Unit::TestCase
     end
     
     should 'not overwrite defaults before last' do
-      assert_equal '%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.parent_id = ob1.id GROUP BY objects.id}', subject.new('objects from objects', :default => {:scope => 'site'}).query.to_s
+      assert_equal '%Q{SELECT objects.* FROM objects JOIN objects AS ob1 WHERE objects.parent_id = ob1.id GROUP BY objects.id}', subject.new('objects from objects', :default => {:scope => 'site'}).query.to_s
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 29
   prerelease: 
   segments: 
   - 1
+  - 2
   - 1
-  - 4
-  version: 1.1.4
+  version: 1.2.1
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-10 00:00:00 +02:00
+date: 2013-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency