dircat 0.2.0 → 0.2.1

data/bin/scat

@@ -4,6 +4,6 @@ require 'rubygems'
 cwd = File.expand_path(File.join(File.dirname(__FILE__), %w{.. lib}))
 $:.unshift(cwd) unless $:.include?(cwd)
 
-require 'simple_cataloger_cli'
-# TODO: we need exit befor run?
+require 'dircat_on_sqlite_cli'
+# TODO: we need exit before run?
 CliCat.run!

data/lib/dircat/cat_on_sqlite/migration/03_create_items.rb

@@ -8,7 +8,7 @@ class CreateItems < ActiveRecord::Migration
       t.string :name, :null => false
       t.string :path, :null => false
       t.string :path_from_catalog_root, :null => false
-      t.integer :size, :null => false
+      t.integer :size
 
       t.date :added_at, :null => false
 

data/lib/dircat/cat_on_sqlite/model/image.rb

@@ -22,3 +22,35 @@ module SimpleCataloger
   end
 
 end
+
+
+## -*- coding: utf-8 -*-
+#module SimpleCataloger
+#
+#  class Image
+#    include DataMapper::Resource
+#
+#    property :id, Serial
+#    property :path, String
+#    property :path_from_catalog_root, String
+#
+#    belongs_to :item, :required => false
+#    belongs_to :tag, :required => false
+#
+#    def to_json(*a)
+#      {:item => if item then
+#                  item.name
+#                else
+#                  nil
+#                end,
+#       :tag  => if tag then
+#                  tag.name
+#                else
+#                  nil
+#                end,
+#       :src  => path_from_catalog_root}.to_json(*a)
+#    end
+#
+#  end
+#
+#end

data/lib/dircat/cat_on_sqlite/model/item.rb

@@ -17,3 +17,29 @@ module SimpleCataloger
   end
 
 end
+
+
+## -*- coding: utf-8 -*-
+#module SimpleCataloger
+#
+#  class Item
+#    include DataMapper::Resource
+#    property :id, Serial
+#    property :name, String
+#
+#    property :added_at, Date
+#    property :path, String
+#    property :path_from_catalog_root, String
+#    property :rating, Integer
+#    property :flagged_at, Date
+#
+#    has n, :taggings
+#    has n, :tags, :through => :taggings
+#    has n, :images
+#
+#    def to_s
+#      @name
+#    end
+#  end
+#
+#end

data/lib/dircat/cat_on_sqlite/model/tag.rb

@@ -56,3 +56,68 @@ module SimpleCataloger
   end # class Tag
 
 end # module SimpleCatalog
+
+
+
+## -*- coding: utf-8 -*-
+#module SimpleCataloger
+#
+#  class Tag
+#    include DataMapper::Resource
+#
+#    property :id, Serial
+#    property :name, String
+#
+#    belongs_to :category, 'Category', :child_key => [:category_id]
+#    has n, :taggings
+#    has n, :items, :through => :taggings, :order => [:name]
+#    has n, :images
+#
+#    ##################################################
+#    #
+#
+#    RE_TAG = /\[([^\]]+)\]/
+#
+#    # extracts tags from directory or file name
+#    def self.extract_tags(dir_or_file_name)
+#      tags       = []
+#      match_data = dir_or_file_name.match(RE_TAG)
+#      while match_data
+#        tags << match_data[1]
+#        match_data = dir_or_file_name.match(RE_TAG, match_data.end(0))
+#      end
+#      tags
+#    end
+#
+#    def self.extract_name(dir_or_file_name)
+#      dir_or_file_name.gsub(Tag::RE_TAG, '').strip
+#    end
+#
+#    RE_RATING = /^\d$/
+#    RE_YEAR   = /^\d\d\d\d$/
+#
+#    MATCHES   = [
+#        [RE_RATING, "rating", proc { |tag_name| tag_name.to_i }],
+#        [RE_YEAR, "year", proc { |tag_name| tag_name.to_i }]
+#    ]
+#
+#    #
+#    # decode standard tags
+#    #
+#    def self.match_category(tag_name)
+#      MATCHES.each do |re, category_name, convert|
+#        if re.match tag_name
+#          category = Category.first_or_create(:name => category_name)
+#          tag      = Tag.first_or_create(
+#              :name     => convert.call(tag_name),
+#              :category => category
+#          )
+#          return tag
+#        end
+#      end
+#      nil
+#    end
+#
+#  end # class Tag
+#
+#end # module SimpleCatalog

data/lib/dircat/cat_on_sqlite/model/tagging.rb

@@ -7,3 +7,16 @@ module SimpleCataloger
   end
 
 end # module
+
+
+## -*- coding: utf-8 -*-
+#module SimpleCataloger
+#
+#  class Tagging
+#    include DataMapper::Resource
+#    property :id, Serial
+#    belongs_to :item
+#    belongs_to :tag
+#  end
+#
+#end # module

data/lib/dircat/cat_on_sqlite_cli/cmd_server.rb

@@ -14,8 +14,8 @@ module SimpleCataloger
     end
 
     def self.usage
-      "#{command} <catalog name> <directory>"
-      "Create a catalog with name <catalog name> starting from structure of <directory>"
+      "#{command}  <catalog name>\n" +
+      "launch a webs server to browse the content of <catalog name>\n"
     end
 
     def defaults(options)

data/lib/dircat/server/web_server.rb

@@ -34,6 +34,10 @@ module SimpleCataloger
     helpers Sinatra::GroupItems
     helpers Helpers
 
+    after do
+      ActiveRecord::Base.clear_active_connections!
+    end
+
     get '/app.css' do
       content_type 'text/css', :charset => 'utf-8'
       sass :app

data/lib/dircat/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 module DirCat
   NAME="dircat"
-  VERSION="0.2.0"
+  VERSION="0.2.1"
 end

data/spec/fixtures/tmp/prova.yml

@@ -0,0 +1,8 @@
+---
+:roots:
+- /home/gf/GioPrj.home/dircat/spec/fixtures/films
+:ignore:
+- sub
+- subtitles
+- images
+:version: 0.2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dircat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tree.rb
@@ -339,16 +339,6 @@ files:
 - lib/simple_cataloger_dm/core/catalog.rb
 - lib/simple_cataloger_dm/core/extensions.rb
 - lib/simple_cataloger_dm/core/directory_visitor.rb
-- lib/simple_cataloger_dm/core.rb
-- lib/simple_cataloger_dm/cli.rb
-- lib/simple_cataloger_dm/models/image.rb
-- lib/simple_cataloger_dm/models/tag.rb
-- lib/simple_cataloger_dm/models/tagging.rb
-- lib/simple_cataloger_dm/models/category.rb
-- lib/simple_cataloger_dm/models/item.rb
-- lib/simple_cataloger_dm/server/my_static.rb
-- lib/simple_cataloger_dm/server/helpers.rb
-- lib/simple_cataloger_dm/server/web_server.rb
 - lib/dircat.rb
 - lib/dircat_on_sqlite.rb
 - examples/example.rb
@@ -366,6 +356,8 @@ files:
 - spec/dircat/cat_on_sqlite_web/web_server_spec.rb
 - spec/fixtures/tmp/test_ar.sqlite3
 - spec/fixtures/tmp/test_ar.yml
+- spec/fixtures/tmp/prova.sqlite3
+- spec/fixtures/tmp/prova.yml
 - spec/fixtures/dir1/subdir/file3.txt
 - spec/fixtures/dir1/file1.txt
 - spec/fixtures/dir2/subdir/file3.txt
@@ -426,6 +418,8 @@ test_files:
 - spec/dircat/cat_on_sqlite_web/web_server_spec.rb
 - spec/fixtures/tmp/test_ar.sqlite3
 - spec/fixtures/tmp/test_ar.yml
+- spec/fixtures/tmp/prova.sqlite3
+- spec/fixtures/tmp/prova.yml
 - spec/fixtures/dir1/subdir/file3.txt
 - spec/fixtures/dir1/file1.txt
 - spec/fixtures/dir2/subdir/file3.txt

data/lib/simple_cataloger_dm/cli.rb

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#
-# rubygems
-#
-#require 'rubygems'
-#begin
-#  require "bundler/setup"
-#rescue LoadError
-#end
-
-require 'sinatra/base'
-
-gem 'sinatra-group-items', "0.0.1"
-require 'sinatra/group_items'
-
-require 'haml'
-require 'sass'
-require 'json'
-
-#
-# server
-#
-require 'simple_cataloger_server/helpers'
-require 'simple_cataloger_server/my_static'
-require 'simple_cataloger_server/web_server'
-
-#
-# cli
-#
-require 'simple_cataloger_cli/cli_cat'
-Dir[ File.join(File.dirname(__FILE__), "simple_cataloger_cli", "cmd*.rb") ].each { |f|require f }

data/lib/simple_cataloger_dm/core.rb

@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# std lib
-#
-require 'pp'
-require 'optparse'
-require 'fileutils'
-require 'ostruct'
-
-#
-# rubygems
-#
-gem "treevisitor", "0.2.2"
-require 'treevisitor'
-
-gem "optparse-command", "0.1.7"
-require 'optparse-command'
-
-require 'dm-core'
-require 'dm-migrations'
-
-#
-# simple catalog
-#
-require 'simple_cataloger/version'
-require 'simple_cataloger/simple_cataloger_error'
-require 'simple_cataloger/extensions'
-
-#
-# db models
-#
-require 'simple_cataloger/models/item'
-require 'simple_cataloger/models/tag'
-require 'simple_cataloger/models/tagging'
-require 'simple_cataloger/models/category'
-require 'simple_cataloger/models/image'
-
-#
-# app
-#
-require 'simple_cataloger/directory_visitor'
-require 'simple_cataloger/catalog'
-

data/lib/simple_cataloger_dm/models/category.rb

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-module SimpleCataloger
-
-  class Category
-    include DataMapper::Resource
-
-    property :id, Serial
-    property :name, String
-
-    has n, :tags, :order => [:name]
-
-    def self.order_by_name
-      all(:order => [:name])
-    end
-
-    def items
-      tags.collect { |t| t.items }.flatten
-    end
-  end
-
-end

data/lib/simple_cataloger_dm/models/image.rb

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-module SimpleCataloger
-
-  class Image
-    include DataMapper::Resource
-
-    property :id, Serial
-    property :path, String
-    property :path_from_catalog_root, String
-
-    belongs_to :item, :required => false
-    belongs_to :tag, :required => false
-
-    def to_json(*a)
-      {:item => if item then
-                  item.name
-                else
-                  nil
-                end,
-       :tag  => if tag then
-                  tag.name
-                else
-                  nil
-                end,
-       :src  => path_from_catalog_root}.to_json(*a)
-    end
-
-  end
-
-end

data/lib/simple_cataloger_dm/models/item.rb

@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-module SimpleCataloger
-
-  class Item
-    include DataMapper::Resource
-    property :id, Serial
-    property :name, String
-
-    property :added_at, Date
-    property :path, String
-    property :path_from_catalog_root, String
-    property :rating, Integer
-    property :flagged_at, Date
-
-    has n, :taggings
-    has n, :tags, :through => :taggings
-    has n, :images
-
-    def to_s
-      @name
-    end
-  end
-
-end

data/lib/simple_cataloger_dm/models/tag.rb

@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-module SimpleCataloger
-
-  class Tag
-    include DataMapper::Resource
-
-    property :id, Serial
-    property :name, String
-
-    belongs_to :category, 'Category', :child_key => [:category_id]
-    has n, :taggings
-    has n, :items, :through => :taggings, :order => [:name]
-    has n, :images
-
-    ##################################################
-    #
-
-    RE_TAG = /\[([^\]]+)\]/
-
-    # extracts tags from directory or file name
-    def self.extract_tags(dir_or_file_name)
-      tags       = []
-      match_data = dir_or_file_name.match(RE_TAG)
-      while match_data
-        tags << match_data[1]
-        match_data = dir_or_file_name.match(RE_TAG, match_data.end(0))
-      end
-      tags
-    end
-
-    def self.extract_name(dir_or_file_name)
-      dir_or_file_name.gsub(Tag::RE_TAG, '').strip
-    end
-
-    RE_RATING = /^\d$/
-    RE_YEAR   = /^\d\d\d\d$/
-
-    MATCHES   = [
-        [RE_RATING, "rating", proc { |tag_name| tag_name.to_i }],
-        [RE_YEAR, "year", proc { |tag_name| tag_name.to_i }]
-    ]
-
-    #
-    # decode standard tags
-    #
-    def self.match_category(tag_name)
-      MATCHES.each do |re, category_name, convert|
-        if re.match tag_name
-          category = Category.first_or_create(:name => category_name)
-          tag      = Tag.first_or_create(
-              :name     => convert.call(tag_name),
-              :category => category
-          )
-          return tag
-        end
-      end
-      nil
-    end
-
-  end # class Tag
-
-end # module SimpleCatalog

data/lib/simple_cataloger_dm/models/tagging.rb

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-module SimpleCataloger
-
-  class Tagging
-    include DataMapper::Resource
-    property :id, Serial
-    belongs_to :item
-    belongs_to :tag
-  end
-
-end # module

data/lib/simple_cataloger_dm/server/helpers.rb

@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-module SimpleCataloger
-  module Helpers
-
-    def partial(template, *args)
-      options = args.extract_options!
-      options.merge!(:layout => false)
-      if collection = options.delete(:collection) then
-        collection.inject([]) do |buffer, member|
-          buffer << haml(template, options.merge(
-              :layout => false,
-              :locals => {template.to_sym => member}
-            )
-          )
-        end.join("\n")
-      else
-        haml(template, options)
-      end
-    end
-
-    def partial_erb(template)
-      erb template
-    end
-
-    def base_url
-      if Sinatra::Application.port == 80
-        "http://#{Sinatra::Application.host}/"
-      else
-        "http://#{Sinatra::Application.host}:#{Sinatra::Application.port}/"
-      end
-    end
-
-    def when_updated(time)
-      days = (Time.now - time) / (60 * 60 * 24)
-      case days.to_i
-      when 0
-        "today"
-      when 1
-        "yesterday"
-      else
-        "#{sprintf("%i", days) } days ago"
-      end
-    end
-
-    def gen_url(field, visible_field = nil)
-      visible_field ||= field
-      pos = request.env['REQUEST_URI'].index "?"
-      url = if pos
-        request.env['REQUEST_URI'][0...pos]
-      else
-        request.env['REQUEST_URI']
-      end
-      "<a href='#{url}?order=#{field}'>#{visible_field}</a>"
-    end
-
-    def rfc_3339(timestamp)
-      timestamp.strftime("%Y-%m-%dT%H:%M:%SZ")
-    end
-  end
-end

data/lib/simple_cataloger_dm/server/my_static.rb

@@ -1,40 +0,0 @@
-module Rack
-
-  # The Rack::Static middleware intercepts requests for static files
-  # (javascript files, images, stylesheets, etc) based on the url prefixes
-  # passed in the options, and serves them using a Rack::File object. This
-  # allows a Rack stack to serve both static and dynamic content.
-  #
-  # Examples:
-  #     use Rack::Static, :urls => ["/media"]
-  #     will serve all requests beginning with /media from the "media" folder
-  #     located in the current directory (ie media/*).
-  #
-  #     use Rack::Static, :urls => ["/css", "/images"], :root => "public"
-  #     will serve all requests beginning with /css or /images from the folder
-  #     "public" in the current directory (ie public/css/* and public/images/*)
-
-  class MyStatic
-
-    def initialize(app, options={})
-      @app = app
-      @urls = options[:urls] || ["/favicon.ico"]
-      root = options[:root] || Dir.pwd
-      @file_server = Rack::File.new(root)
-    end
-
-    def call(env)
-      path = env["PATH_INFO"]
-      puts "mystatic #{path} #{URI.decode(path)}"
-      path = URI.decode(path)
-      can_serve = @urls.any? { |url| path.index(url) == 0 }
-
-      if can_serve
-        @file_server.call(env)
-      else
-        @app.call(env)
-      end
-    end
-
-  end
-end

data/lib/simple_cataloger_dm/server/web_server.rb

@@ -1,171 +0,0 @@
-# -*- coding: utf-8 -*-
-module SimpleCataloger
-
-  class WebServer < Sinatra::Base
-
-    def self.run!(*args)
-      options = args.last.is_a?(::Hash) ? args.last : {}
-      catalog = options[:catalog]
-
-      catalog.roots.each do |root|
-        use Rack::MyStatic,
-            :urls => ["/#{File.basename(root)}"],
-            :root => File.dirname(root)
-        puts "mount #{File.basename(root)} -> #{File.dirname(root)}"
-      end
-
-      define_method :catalog do
-        catalog
-      end
-      super(*args)
-    end
-
-    # turns on static file serving for Sinatra::Base apps
-    enable :static
-
-    server_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'web'))
-    set :public, File.join(server_dir, 'public')
-    set :views, File.join(server_dir, 'views')
-
-    helpers do
-      include Rack::Utils
-      alias_method :h, :escape_html
-    end
-
-    helpers Sinatra::GroupItems
-    helpers Helpers
-
-    get '/app.css' do
-      content_type 'text/css', :charset => 'utf-8'
-      sass :app
-    end
-
-    get "/js/tooltips/tooltips.css" do
-      content_type 'text/css', :charset => 'utf-8'
-      sass "/js/tooltips/tooltips".to_sym
-    end
-
-    get '/' do
-      @catalog = catalog
-      @items   = Item.all
-      order    = params[:o] || "alpha"
-
-      @render  = proc { |item|
-        "<a href=\"/item/#{item.id}\" rel=\"#{item.id}\">#{item.name}</a>" +
-            if item.rating then
-              " (r:#{item.rating})"
-            else
-              " (r:unrated)"
-            end
-      }
-
-      case order
-        when "alpha"
-          @grouped_items = group_items(@items, :group_size => 5)
-          @title         = "Films in alphabetical order (c:#{@items.length})"
-        when "time"
-          @grouped_items = group_items(@items, :group_size => 1, :header => proc { |film| film.added_at })
-          @title         = "Films in time added order (c:#{@items.length})"
-      end
-      haml :items
-    end
-
-    get '/item/:id' do
-      @catalog       = catalog
-      @item          = Item.get(params[:id])
-      @grouped_items = group_items(@item.tags, :group_size => 1, :header => proc { |tag| tag.category.name })
-      haml :item
-    end
-
-    get '/categories' do
-      @catalog    = catalog
-      @categories = Category.all
-      haml :categories
-    end
-
-    get "/category/:id" do
-      @catalog  = catalog
-      @category = Category.get(params[:id])
-      haml :category
-    end
-
-    get "/tag/:id" do
-      @catalog = catalog
-      @tag     = Tag.get(params[:id])
-      haml :tag
-    end
-
-    get "/random" do
-      max_peso = Item.inject.each do |f|
-        f.peso
-      end
-      Random.new.rand(0..maxpeso)
-    end
-
-    #######################################################################################
-    # Ajax
-
-    get '/ajax/ajax_item/:id' do
-      @item = Item.get(params[:id])
-      haml 'ajax/ajax_item'.to_sym, :layout => false
-    end
-
-    post '/ajax/open_folder' do
-      dir = params[:dir] || "/"
-      system("nautilus", dir)
-      "ok"
-    end
-
-    post "/ajax/set-category" do
-      id            = params[:tag_id]
-      category_name = params[:category_name]
-      tag           = Tag.get(id.to_i)
-      category      = Category.first_or_create(:name => category_name)
-      tag.category  = category
-      tag.save
-      catalog.update_categories
-      catalog.write_config
-      "ok"
-    end
-
-    get '/ajax/ajax_set_flag/:id' do
-      @film = Item.get(params[:id])
-      if (params[:checked] == "true")
-        @film.flagged_at = Time.new
-      else
-        @film.flagged_at = nil
-      end
-      @film.save
-      "ok"
-    end
-
-    #######################################################################################
-    # Tests
-
-    get "/test/resize" do
-      @catalog = catalog
-      haml "/test/resize".to_sym
-    end
-
-    get "/test/jquery" do
-      @catalog = catalog
-      haml "/test/jquery".to_sym
-    end
-
-    get "/test/lightbox" do
-      @catalog = catalog
-      haml "/test/lightbox".to_sym
-    end
-
-    get "/test/select" do
-      @catalog = catalog
-      haml "/test/select".to_sym
-    end
-
-    get "/test/protovis" do
-      @catalog = catalog
-      haml "/test/protovis".to_sym
-    end
-  end
-
-end