graph_starter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4537a9fa443ead4fb371c58a6353c7b11b61b776
-  data.tar.gz: bba04ede1062f46677f6a5feeb91dc601e2c0f1f
+  metadata.gz: 8c62eaa30a0e1b703a7565ba225b97e7b4639006
+  data.tar.gz: 350c64371b1f49d43e3ad5a5a3d8835b26a49c64
 SHA512:
-  metadata.gz: 166ca5a40abc2b1664ce121f50c930d047976440f8810831bb399d615e9e29ec24b2ea60e1ee475bb21041c179f1d01bf69203ebbea7167d5e91356a96db64b2
-  data.tar.gz: d2576210af4ee32f4c9714d6195b0fd0583f349a1add17e5a809319c1877cd6f6e530a8e27bac405f58d7c9af3321aad95df95e5b5545ec277bd051050323b74
+  metadata.gz: fea3be17b5a3518836b448fe14ebbcd129cb77427f645a821c83397d2f316b121c76cc490d1b2b0ed6afe31c8834ae1980d5a171a0449b5391bb8fd24d67fb36
+  data.tar.gz: 321801dd33ef789366f29cd680e1b841949404f302b107d07b3bd7bec4d1a42aa2552eb358c465667893f41874e2c9289563681dbbb9dda11620ebc423e46624

data/app/controllers/graph_starter/application_controller.rb

@@ -6,6 +6,6 @@ module GraphStarter
     def model_class
       @model_slug = params[:model_slug]
       @model_slug.classify.constantize
-    end    
+    end
   end
 end

data/app/controllers/graph_starter/assets_controller.rb

@@ -8,31 +8,41 @@ module GraphStarter
     end
 
     def search
-      regexp = Regexp.new('.*' + params[:query].gsub(/\s+/, '.*') + '.*', 'i')
-      assets = asset_set { |scope| scope.where(title: regexp) }
+      assets = asset_set { |scope| scope.for_query(params[:query]) }
       results_data = assets.map do |asset|
+        description = model_class.search_properties.map do |property|
+          "<b>#{property.to_s.humanize}:</b> #{asset.read_attribute(property)}"
+        end.join("<br>")
+
         {
           title: asset.title,
           url: asset_path(id: asset, model_slug: asset.class.model_slug),
-          image: images? && asset.first_image_source && asset.first_image_source.url || nil
-        }.reject {|_, v| v.nil? }
+          description: description,
+          image: images? && asset.first_image_source_url || nil
+        }.reject {|_, v| v.nil? }.tap do |result|
+          model_class.search_properties.each do |property|
+            result[property] = asset.read_attribute(property)
+          end
+        end
       end
 
+      # INCLUDE SEARCH QUERY PROPERTIES IN RESULT!!!
+
       render json: {results: results_data}.to_json
     end
 
-    def asset_set
+    def asset_set(var = :asset)
       associations = []
       associations << :images if images?
       associations << model_class.category_association if model_class.category_association
 
-      scope = model_class_scope
+      scope = model_class_scope(var)
       scope = yield scope if block_given?
 
       scope = scope.limit(50)
 
       if associations.present?
-        scope.query_as(:s).with(:s).proxy_as(model_class_scope.model, :s).with_associations(*associations)
+        scope.query_as(var).with(var).proxy_as(model_class, var).with_associations(*associations)
       else
         scope
       end
@@ -78,12 +88,14 @@ module GraphStarter
       model_class_scope.has_images?
     end
 
-    def model_class_scope
-      @model_class_scope = if defined?(current_user)
-        model_class.authorized_for(current_user)
-      else
-        model_class.all
-      end
+    def model_class_scope(var = :asset)
+      #@model_class_scope = if defined?(current_user)
+      #  model_class.authorized_for(current_user)
+      #else
+      #  model_class.all(var)
+      #end
+
+      @model_class_scope ||= model_class.all(var)
     end
   end
 end

data/app/models/graph_starter/asset.rb

@@ -117,8 +117,22 @@ module GraphStarter
     end
 
 
+    def self.search_properties(*array)
+      if array.empty?
+        @search_properties || [name_property]
+      else
+        @search_properties = array
+      end
+    end
+
     def self.for_query(query)
-      all.where(title: /.*#{query}.*/i)
+      where_clause = self.search_properties.map do |property|
+        fail "Invalid property: #{property}" if attributes[property].nil?
+        "asset.#{property} =~ {query}"
+      end.join(' OR ')
+
+      query_string = query.strip.gsub(/\s+/, '.*')
+      all(:asset).where(where_clause).params(query: "(?i).*#{query_string}.*")
     end
 
     def secret_sauce_recommendations

data/app/views/graph_starter/assets/index.html.slim

@@ -9,7 +9,7 @@
   .ui.divider
 
   javascript:
-    var controller = #{@model_class_scope.model_slug.to_json.html_safe}
+    var controller = #{@model_slug.to_json.html_safe}
 
   coffee:
     $('.ui.search').search
@@ -25,4 +25,4 @@
 
 .ui.divider
 
-= render partial: 'graph_starter/assets/cards', locals: {assets: @assets}
+= render partial: 'graph_starter/assets/cards', locals: {assets: @assets}

data/lib/graph_starter/version.rb

@@ -1,3 +1,3 @@
 module GraphStarter
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graph_starter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Brian Underwood