togostanza 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad8284aaab2b0604b36ee5a2858c066b896753d4
-  data.tar.gz: 0343e25731993482fa2003415b8c8e3e08e60615
+  metadata.gz: 09f09d3dd56cdf9a5299e8ae8500e8b04091bc2f
+  data.tar.gz: dad69b327df8f08983390439b91de9992076c9a3
 SHA512:
-  metadata.gz: 990335cf29dc0b02a7b328d5196d7e3144480b7927451188677659f63ce9a9f84d154feb8b1588d23daa2493a6e2605df3666c32b9370bc1287121a9926bb037
-  data.tar.gz: 270231cda593aedc812633513c6e654a33939ae00a7e4d53df5d2027b8bc91139b11fa950e1dbb6d9f6ade44674cb19c71c377ea6d4183a8e9aa190630c7f07a
+  metadata.gz: 07c4d2275cc2e31db6b8693c1c414ae92487d8647825323686f91eb14026bd6ab98a084a3c3423e083aebb4b7e2c6c85b92e3dcdf1c1829a0cffc03d14381dee
+  data.tar.gz: fab2e05345d3b10ba32a682be54a57f1c7408f7c8985a800020d03ac228e48ec8141a8693ddb2f682188c050f97b59f325c957077f1a21e51ff87070c84a67dd

data/lib/togostanza/application.rb

@@ -56,22 +56,6 @@ module TogoStanza
       render :html, @stanza.help, layout_engine: :haml
     end
 
-    get '/:id/text_search' do |id|
-      @stanza    = Stanza.find(id).new
-      stanza_uri = request.env['REQUEST_URI'].gsub(/\/text_search.*/, '')
-
-      begin
-        identifiers = @stanza.text_search(params[:q]).map {|param_hash|
-          parameters = Rack::Utils.build_query(param_hash)
-          "#{stanza_uri}?#{parameters}"
-        }
-
-        json enabled: true, count: identifiers.size, urls: identifiers
-      rescue NoSearchDeclarationError
-        json enabled: false, count: 0, urls: []
-      end
-    end
-
     get '/:id/metadata.json' do |id|
       @stanza = Stanza.find(id).new
 

data/lib/togostanza/stanza/base.rb

@@ -158,7 +158,6 @@ module TogoStanza::Stanza
   autoload :Grouping,      'togostanza/stanza/grouping'
   autoload :Markdown,      'togostanza/stanza/markdown'
   autoload :Querying,      'togostanza/stanza/querying'
-  autoload :TextSearch,    'togostanza/stanza/text_search'
 
   class Context < Hashie::Mash
     def respond_to_missing?(*)
@@ -171,7 +170,6 @@ module TogoStanza::Stanza
     extend ExpressionMap::Macro
     include Querying
     include Grouping
-    include TextSearch
 
     define_expression_map :properties
     define_expression_map :resources

data/lib/togostanza/version.rb

@@ -1,3 +1,3 @@
 module TogoStanza
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/lib/togostanza.rb

@@ -8,20 +8,10 @@ module TogoStanza
   autoload :Stanza,      'togostanza/stanza'
 
   class << self
-    attr_accessor :text_search_method
-
-    def configure
-      yield self
-    end
-
     def sprockets
       @sprockets ||= Sprockets::Environment.new.tap {|sprockets|
         sprockets.append_path File.expand_path('../../assets', __FILE__)
       }
     end
   end
-
-  configure do |config|
-    config.text_search_method = :regex
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: togostanza
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Keita Urashima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -286,8 +286,6 @@ files:
 - lib/togostanza/stanza/grouping.rb
 - lib/togostanza/stanza/markdown.rb
 - lib/togostanza/stanza/querying.rb
-- lib/togostanza/stanza/search_query.rb
-- lib/togostanza/stanza/text_search.rb
 - lib/togostanza/version.rb
 - spec/dummy/app.rb
 - spec/dummy/bar_stanza/help.md

data/lib/togostanza/stanza/search_query.rb

@@ -1,87 +0,0 @@
-require 'strscan'
-
-module TogoStanza::Stanza
-  class SearchQuery
-    def initialize(query)
-      @raw = query
-    end
-
-    attr_reader :raw
-
-    def to_filter(method, var_name)
-      "FILTER (#{to_clause(method, var_name)})"
-    end
-
-    def tokens
-      @tokens ||= begin
-        scanner = StringScanner.new(@raw)
-        scanner.skip /\s+/
-
-        parse(scanner)
-      end
-    end
-
-    private
-
-    def to_clause(method, var_name)
-      case method.to_s
-      when 'regex', 'contains'
-        tokens.each_with_object('') {|token, acc|
-          case token
-          when :lparen
-            acc << '('
-          when :rparen
-            acc << ')'
-          when :or
-            acc << ' || '
-          when :and
-            acc << ' && '
-          else
-            acc << "#{method}(?#{var_name}, #{token.inspect})"
-          end
-        }
-      when 'bif_contains'
-        clause = tokens.each_with_object('') {|token, acc|
-          case token
-          when :lparen
-            acc << '('
-          when :rparen
-            acc << ')'
-          when :or
-            acc << ' OR '
-          when :and
-            acc << ' AND '
-          else
-            acc << token.inspect
-          end
-        }
-
-        "bif:contains(?#{var_name}, '#{clause}')"
-      else
-        raise ArgumentError, method
-      end
-    end
-
-    def parse(scanner, tokens = [])
-      scanner.skip /\s+\z/
-
-      return tokens if scanner.eos?
-
-      if scanner.scan(/"((?:[^\\"]|\\.)*)"/)
-        tokens << scanner[1].gsub(/\\(.)/, '\1')
-      elsif scanner.scan(/\(\s*/)
-        tokens << :lparen
-      elsif scanner.scan(/\s*\)/)
-        tokens << :rparen
-      elsif scanner.scan(/\s*OR\s*/)
-        tokens << :or
-      elsif scanner.scan(/\s*AND\s*|\s+/)
-        tokens << :and
-      else
-        tokens << scanner.scan(/\S+(?<!\))/)
-      end
-
-      parse(scanner, tokens)
-    end
-  end
-end

data/lib/togostanza/stanza/text_search.rb

@@ -1,39 +0,0 @@
-require 'togostanza/stanza/search_query'
-
-class TogoStanza::NoSearchDeclarationError < StandardError; end
-
-module TogoStanza::Stanza
-  module TextSearch
-    extend ActiveSupport::Concern
-
-    def text_search_filter(var_name, query)
-      query.to_filter(TogoStanza.text_search_method, var_name)
-    end
-
-    def text_search(input)
-      raise TogoStanza::NoSearchDeclarationError unless self.class.method_defined?(:search_declarations)
-
-      query = SearchQuery.new(input)
-
-      return [] if query.tokens.empty?
-
-      search_declarations.each_value.flat_map {|block|
-        instance_exec(query, &block)
-      }
-    end
-
-    module ClassMethods
-      def search(symbol, &block)
-        unless method_defined?(:search_declarations)
-          # テキスト検索宣言の初期化
-          instance_eval do
-            class_attribute :search_declarations
-            self.search_declarations = {}
-          end
-        end
-
-        search_declarations[symbol] = block
-      end
-    end
-  end
-end