enju_bookmark 0.1.2.pre3 → 0.1.2.pre4

data/lib/enju_bookmark/calculate_stat.rb

@@ -12,7 +12,7 @@ module CalculateStat
   module ClassMethods
     def calculate_stat
       self.not_calculated.each do |stat|
-        stat.aasm_calculate!
+        stat.calculate!
       end
     end
   end

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre3"
+  VERSION = "0.1.2.pre4"
 end

data/spec/dummy/config/application.rb

@@ -44,7 +44,7 @@ module Dummy
 end
 
 require 'enju_circulation'
-require 'enju_leaf'
 require 'enju_biblio'
 require 'enju_library'
 require 'enju_manifestation_viewer'
+require 'mobile-fu'

data/spec/dummy/solr/conf/schema.xml

@@ -84,11 +84,14 @@
     <fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true"/>
+
+    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
+    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
   </types>
   <fields>
     <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a previously defined type from the 
+     type: mandatory - the name of a previously defined type from the
        <types> section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
@@ -223,8 +226,17 @@
     <dynamicField name="*_ets" stored="true" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
     <!-- *** This dynamicField is used by Sunspot! *** -->
     <dynamicField name="*_etms" stored="true" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
+
+    <!-- Type used to index the lat and lon components for the "location" FieldType -->
+    <dynamicField name="*_coordinate"  type="tdouble" indexed="true"  stored="false" multiValued="false"/>
+    <dynamicField name="*_p" type="location" indexed="true" stored="true" multiValued="false"/>
+
+    <dynamicField name="*_ll" stored="false" type="location" multiValued="false" indexed="true"/>
+    <dynamicField name="*_llm" stored="false" type="location" multiValued="true" indexed="true"/>
+    <dynamicField name="*_lls" stored="true" type="location" multiValued="false" indexed="true"/>
+    <dynamicField name="*_llms" stored="true" type="location" multiValued="true" indexed="true"/>
   </fields>
-  <!-- Field to use to determine and enforce document uniqueness. 
+  <!-- Field to use to determine and enforce document uniqueness.
       Unless this field is marked with required="false", it will be a required field
    -->
   <uniqueKey>id</uniqueKey>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre3
+  version: 0.1.2.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre6
+        version: 0.1.0.pre8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre6
+        version: 0.1.0.pre8
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre5
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre6
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.120720
+        version: 2.0.0.pre.120925
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.120720
+        version: 2.0.0.pre.120925
+- !ruby/object:Gem::Dependency
+  name: mobile-fu
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Purchase request management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -421,11 +437,6 @@ files:
 - spec/dummy/db/migrate/20120728204337_create_series_statement_relationships.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/lib/enju_leaf/calculate_stat.rb
-- spec/dummy/lib/enju_leaf/expire_editable_fragment.rb
-- spec/dummy/lib/enju_leaf/import_file.rb
-- spec/dummy/lib/enju_leaf/url_validator.rb
-- spec/dummy/lib/enju_leaf.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -443,7 +454,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_3c
+- spec/dummy/solr/data/test/index/segments_1v
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb
@@ -482,7 +493,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
-homepage: https://github.com/nabeta/enju_bookmark.git
+homepage: https://github.com/nabeta/enju_bookmark
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -674,11 +685,6 @@ test_files:
 - spec/dummy/db/migrate/20120728204337_create_series_statement_relationships.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/lib/enju_leaf/calculate_stat.rb
-- spec/dummy/lib/enju_leaf/expire_editable_fragment.rb
-- spec/dummy/lib/enju_leaf/import_file.rb
-- spec/dummy/lib/enju_leaf/url_validator.rb
-- spec/dummy/lib/enju_leaf.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -696,7 +702,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_3c
+- spec/dummy/solr/data/test/index/segments_1v
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb

data/spec/dummy/lib/enju_leaf/calculate_stat.rb

@@ -1,30 +0,0 @@
-module CalculateStat
-
-  def self.included(base)
-    base.extend ClassMethods
-    base.send :include, InstanceMethods
-    base.class_eval do
-      validates_presence_of :start_date, :end_date
-      validate :check_date
-    end
-  end
-
-  module ClassMethods
-    def calculate_stat
-      self.not_calculated.each do |stat|
-        stat.aasm_calculate!
-      end
-    end
-  end
-
-  module InstanceMethods
-    def check_date
-      if self.start_date and self.end_date
-        if self.start_date >= self.end_date
-          errors.add(:start_date)
-          errors.add(:end_date)
-        end
-      end
-    end
-  end
-end

data/spec/dummy/lib/enju_leaf/expire_editable_fragment.rb

@@ -1,62 +0,0 @@
-module ExpireEditableFragment
-  def expire_editable_fragment(record, fragments = [], formats = [])
-    fragments.uniq!
-    fragments = ['detail'] if fragments.empty?
-    if record
-      if record.is_a?(Manifestation)
-        expire_manifestation_cache(record, fragments, formats)
-      else
-        I18n.available_locales.each do |locale|
-          Role.all_cache.each do |role|
-            fragments.each do |fragment|
-              expire_fragment(:controller => record.class.to_s.pluralize.downcase, :action => :show, :id => record.id, :page => fragment, :role => role.name, :locale => locale)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def expire_manifestation_cache(manifestation, fragments = [], formats = [])
-    fragments = %w[detail pickup title show_list show_index sru] if fragments.size == 1 and fragments.first == 'detail'
-    expire_fragment(:controller => :manifestations, :action => :index, :page => 'numdocs')
-    fragments.uniq.each do |fragment|
-      expire_manifestation_fragment(manifestation, fragment, formats)
-    end
-    if defined?(EnjuBookmark)
-      manifestation.bookmarks.each do |bookmark|
-        expire_tag_cloud(bookmark)
-      end
-    end
-  end
-
-  def expire_manifestation_fragment(manifestation, fragment, formats = [])
-    formats = ['atom', 'csv', 'html', 'mods', 'mobile', 'oai_list_identifiers', 'oai_list_records', 'rdf', 'rss'] if formats.empty?
-    if manifestation
-      I18n.available_locales.each do |locale|
-        if fragment == 'holding'
-          expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :locale => locale, :manifestation_id => nil)
-          formats.each do |format|
-            expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :locale => locale, :format => format, :manifestation_id => nil)
-          end
-        else
-          Role.all_cache.each do |role|
-            expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :role => role.name, :locale => locale, :manifestation_id => nil)
-            formats.each do |format|
-              expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :role => role.name, :locale => locale, :format => format, :manifestation_id => nil)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def expire_tag_cloud(bookmark)
-    I18n.available_locales.each do |locale|
-      Role.all_cache.each do |role|
-        expire_fragment(:controller => :tags, :action => :index, :page => 'user_tag_cloud', :user_id => bookmark.user.username, :locale => locale, :role => role.name, :user_id => nil)
-        expire_fragment(:controller => :tags, :action => :index, :page => 'public_tag_cloud', :locale => locale, :role => role.name, :user_id => nil)
-      end
-    end
-  end
-end

data/spec/dummy/lib/enju_leaf/import_file.rb

@@ -1,13 +0,0 @@
-module ImportFile
-  def self.included(base)
-    base.extend ClassMethods
-  end
-
-  module ClassMethods
-    def expire
-      self.stucked.find_each do |file|
-        file.destroy
-      end
-    end
-  end
-end

data/spec/dummy/lib/enju_leaf/url_validator.rb

@@ -1,10 +0,0 @@
-class UrlValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    url = ::Addressable::URI.parse(value)
-    if url
-      unless ['http', 'https'].include?(url.scheme)
-        record.errors.add(attribute.to_sym)
-      end
-    end
-  end
-end

data/spec/dummy/lib/enju_leaf.rb

@@ -1,4 +0,0 @@
-require 'enju_leaf/calculate_stat'
-require 'enju_leaf/expire_editable_fragment'
-require 'enju_leaf/import_file'
-require 'enju_leaf/url_validator'