mongoid-dsl 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07cba5496b2f12f68d75578a881013f36b133288
-  data.tar.gz: 478b9e6aea688f647d828e4c165f79c6d2fba26b
+  metadata.gz: 928b2c13156001ffe932ffa4201615a28104110b
+  data.tar.gz: e6600e3388d6de69f86435e48b4cdc4c9574da34
 SHA512:
-  metadata.gz: 61812e613671a67fd4c76bfb4e8d00194782f230b374828859bc53f8357d034f695b71c13dc03b60710e9a7ca8de2d6cfb8823a6ce0227a093a05010b3c028b5
-  data.tar.gz: f791fc0ff404285a5b5a1e372119f6b3bbba55666170ff4d47c8dfd1de99485b4eea0da53e6c22d7de633f111197e45daf4814d017ecdf2ea425a2ee1ea4f399
+  metadata.gz: 19438b72f6df2eb261fc584c57f73bb0e1fa7b259d14335f124a0e7882aa5028fbc9f528e921c84c9a081499ac403fa91b1abf18d27db7eefaead3946fefa293
+  data.tar.gz: 94b87661afaefde981345e4c43ae887c5308736b39d80649f33e17df56772dfa54677e6ec6ea692e8d748551d165fae80fbb2f587617cdc3d482d00ef8989dba

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/mongoid-dsl/fields-ext.rb

@@ -187,23 +187,73 @@ end
 
     field.instance_variable_get('@options')[:hidden]= field.instance_variable_get('@options').delete(name_to_use)
 
-    model.instance_eval do
+    if value
+      model.instance_eval do
+
+        begin
+          self.class_variable_get(:@@mongoid_dsl_hidden_fields)
+        rescue NameError
 
-      begin
-        self.class_variable_get(:@@mongoid_dsl_hidden_fields)
-      rescue NameError
+          self.class_variable_set :@@mongoid_dsl_hidden_fields, []
+          [:hidden,:hide].each { |sym| scope sym, -> { without(*self.class_variable_get(:@@mongoid_dsl_hidden_fields)) } }
 
-        self.class_variable_set :@@mongoid_dsl_hidden_fields, []
-        [:hidden,:hide].each { |sym| scope sym, -> { without(*self.class_variable_get(:@@mongoid_dsl_hidden_fields)) } }
+          unless default_scoping?
+            default_scope -> { hidden }
+          end
 
-        unless default_scoping?
-          default_scope -> { hidden }
         end
 
+        self.class_variable_get(:@@mongoid_dsl_hidden_fields).push(field.instance_variable_get(:@name)) if !!value
+
       end
+    end
+
+  end
+end
+
+[:index].each do |name_to_use|
+  Mongoid::Fields.option name_to_use do |model, field, value|
+
+    field.instance_variable_get('@options')[:index]= field.instance_variable_get('@options').delete(name_to_use)
+
+    if value
+      model.instance_eval do
+
+        begin
+          self.class_variable_get(:@@mongoid_dsl_index_fields)
+        rescue NameError
+          self.class_variable_set :@@mongoid_dsl_index_fields, [{},{}]
+        end
+
+        case
+
+          when value.class <= Hash
+            self.class_variable_get(:@@mongoid_dsl_index_fields)[0].merge!(value)
+
+          when value.class <= Array
+            2.times do |index_number|
+              if value[index_number].class <= Hash
+                self.class_variable_get(:@@mongoid_dsl_index_fields)[index_number].merge!(value[index_number])
+              end
+            end
 
-      self.class_variable_get(:@@mongoid_dsl_hidden_fields).push(field.instance_variable_get(:@name)) if !!value
+          when value.class <= TrueClass
+            self.class_variable_get(:@@mongoid_dsl_index_fields)[0].merge!(
+                {field.instance_variable_get(:@name) => 1}
+            )
 
+          when value.class <= Numeric && (-1..1).include?(value)
+            self.class_variable_get(:@@mongoid_dsl_index_fields)[0].merge!(
+                {field.instance_variable_get(:@name) => value}
+            )
+
+        end
+
+        if self.class_variable_get(:@@mongoid_dsl_index_fields)[0].respond_to?(:empty?) && !self.class_variable_get(:@@mongoid_dsl_index_fields)[0].empty?
+          index(*(self.class_variable_get(:@@mongoid_dsl_index_fields).select{|e| e.respond_to?(:empty?) && !e.empty? }))
+        end
+
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-dsl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Adam Luzsi