storys 0.0.3 → 0.0.4

data/bin/storys

@@ -1,18 +1,8 @@
 #!/usr/bin/env ruby
 
 require "storys"
-require "highline/import"
 
-command = ARGV.first || "sync"
-root_path = Pathname.new(ARGV[1] || ".").realpath
+root_path = Pathname.new(ARGV.first || ".").realpath
 
-case command
-when "install"
-  storys = Storys::Storys.new(root_path)
-  storys.install
-when "update"
-  storys = Storys::Storys.new(root_path)
-  storys.update
-else
-  puts "Unknown command #{command.inspect}"
-end
+storys = Storys::Package.new(root_path)
+storys.update

data/lib/storys/package.rb

@@ -0,0 +1,69 @@
+class Storys::Package
+  attr_reader :root_path
+  attr_reader :package_path
+
+  def initialize(root_path)
+    raise "root_path must be an instance of Pathname" unless root_path.is_a?(Pathname)
+
+    @root_path = root_path
+    @package_path = root_path + ".storys/"
+  end
+
+  def pathname_to_url(path, relative_from)
+    URI.escape(path.relative_path_from(relative_from).to_s)
+  end
+
+  def url_to_pathname(url)
+    path = Addressable::URI.unencode_component(url.normalized_path)
+    path.gsub!(/^\//, "") #Make relative, if we allow mounting at a different root URL this will need to remove the root instead of just '/'
+    root_url_path + path
+  end
+
+  def update
+    package_path.mkdir unless File.exists?(package_path)
+    update_app
+    Storys::Update.new(self)
+  end
+
+  def update_app
+    dev = ENV["STORYS_ENV"] == "development"
+
+    app_children_paths.each do |file|
+      storys_file = package_path + file.basename
+      FileUtils.rm_rf(storys_file, :verbose => dev)
+    end
+
+    if dev
+      app_children_paths.each do |file|
+        storys_file = package_path + file.basename
+        FileUtils.ln_sf(file, storys_file, :verbose => dev)
+      end
+    else
+      FileUtils.cp_r(Storys::Package.gem_path + "app/.", package_path, :verbose => dev)
+    end
+
+    FileUtils.chmod_R(0755, package_path, :verbose => dev)
+  end
+
+  def self.gem_path
+    Pathname.new(__FILE__).dirname.parent.parent
+  end
+
+  def self.load_json(path)
+    if File.exists?(path)
+      JSON.parse(File.read(path))
+    else
+      nil
+    end
+  end
+
+  def self.save_json(path, data)
+    File.open(path, "w") { |f| f << data.to_json }
+  end
+
+  private
+  def app_children_paths
+    app_path = Storys::Package.gem_path + "app/"
+    app_path.children.reject { |f| f.basename.to_s == "img"} #TODO: Deal with this directory properly
+  end
+end

data/lib/storys/story.rb

@@ -1,11 +1,15 @@
 class Storys::Story
-  attr_reader :storys
-  attr_reader :path, :nsf
+  attr_reader :package
+  attr_reader :path
 
-  def initialize(storys, path)
-    @storys = storys
+  def initialize(package, path)
+    @package = package
     @path = path
-    @nsf = Nsf::Document.from_html(File.read(@path))
+  end
+
+  #It is assumed that the HTML document is a valid HTML expression of an NSF document
+  def html
+    @html ||= File.read(@path)
   end
 
   def path_hash
@@ -13,26 +17,45 @@ class Storys::Story
   end
 
   def url
-    storys.pathname_to_url(path, storys.storys_path)
+    package.pathname_to_url(path, package.package_path)
   end
 
   def title
-    title = nsf.title 
+    title = title_from_html
     title = path.basename.to_s.chomp(path.extname.to_s) if title == ""
+
+    directory_path = path.relative_path_from(package.root_path).dirname.to_s
+
+    title = "#{directory_path}/#{title}" unless directory_path == "" || directory_path == "."
+    title = title.gsub("/", " / ")
+
     title
   end
 
-  def self.from_hash(storys, data)
-    Storys::Story.new(storys, storys.url_to_pathname(Addressable::URI.parse(data["url"])))
+  def self.from_hash(package, data)
+    Storys::Story.new(package, package.url_to_pathname(Addressable::URI.parse(data["url"])))
   end
 
   def to_hash
     {
       "url" => url,
-      "wordCount" => nsf.to_nsf.split(/\s+/).length,
+      "wordCount" => word_count_from_html,
       "title" => title,
       "publishedOn" => path.mtime.to_i,
       "key" => path_hash
     }
   end
+
+  private
+
+  def title_from_html
+    html =~ /<title>(.*?)<\/title>/m
+    $1 ? CGI::unescapeHTML($1) : ""
+  end
+
+  def word_count_from_html
+    html =~ /<body>(.*?)<\/body>/m
+    body = CGI::unescapeHTML($1.gsub(/<\/?(p|b|i|h[1234567]).*?>/m, " "))
+    (title + " " + (body ? body : "")).split(/\s+/).length
+  end
 end

data/lib/storys/update.rb

@@ -1,26 +1,35 @@
 class Storys::Update
-  attr_reader :storys
+  attr_reader :package
   attr_accessor :stories
 
-  def initialize(storys)
-    @storys = storys
+  def initialize(package)
+    @package = package
 
-    @files = storys.root_path.descendant_files.reject { |p| p.basename.to_s[0..0] == '.' }
+    @files = package.root_path.descendant_files.reject { |p| p.basename.to_s[0..0] == '.' }
     @stories = []
     #load_data
     process
     save_data
+    puts "\nDone!"
   end
 
   def load_data
-    self.stories = (Storys::Storys.load_json(storys.storys_path + "data.json") || []).map { |b| Storys::Story.from_hash(storys, b) }
+    self.stories = (Storys::Package.load_json(package.package_path + "data.json") || []).map { |b| Storys::Story.from_hash(package, b) }
   end
 
   def save_data
     puts "\nWriting out JSON file"
-    Storys::Storys.save_json(storys.storys_path + "data.json", stories.map { |b| b.to_hash })
+    stories_hashes = []
+    stories.each_with_index do |s, i|
+      $stdout.write "\rProcessing #{i + 1} of #{stories.length} (#{(((i + 1) / stories.length.to_f) * 100.0).round}%)"
+      $stdout.flush
+
+      stories_hashes << s.to_hash
+    end
+    Storys::Package.save_json(package.package_path + "data.json", stories_hashes)
   end
 
+
   def process
     @files.each_with_index do |f, i|
       $stdout.write "\rProcessing #{i + 1} of #{@files.length} (#{(((i + 1) / @files.length.to_f) * 100.0).round}%)"
@@ -45,7 +54,7 @@ class Storys::Update
   end
 
   def created(f)
-    story = Storys::Story.new(storys, f)
+    story = Storys::Story.new(package, f)
     stories << story
   end
 

data/lib/storys/version.rb

@@ -1,3 +1,3 @@
 module Storys
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/storys.rb

@@ -1,6 +1,7 @@
 #Ruby stdlib
 require "pathname"
 require "fileutils"
+require "cgi"
 require "uri"
 require "json"
 require "digest"
@@ -8,7 +9,6 @@ require "digest"
 #Gems
 require "addressable/uri"
 require "naturally"
-require "nsf"
 
 #Core Extensions
 require "storys/core_ext/pathname"
@@ -16,8 +16,6 @@ require "storys/core_ext/pathname"
 module Storys
 end
 
-require "storys/storys"
-require "storys/storys_package"
+require "storys/package"
 require "storys/update"
 require "storys/story"
-require "storys/template_helper"

data/storys.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_dependency "addressable", ">= 2.3.5"
   s.add_dependency "naturally", ">= 1.0.3"
-  s.add_dependency "nsf"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storys
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: nsf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A collection of stories is a directory (the container) containing 1..*
   HTML files (stories). Storys indexes a collection in this format, and generates
   a HTML/JS Single Page Application (SPA) that allows you to browse and view stories
@@ -84,8 +70,13 @@ files:
 - Rakefile
 - app/css/app.css
 - app/css/colorbox.css
+- app/css/lib/bootstrap.css
 - app/css/views.index.css
 - app/css/views.show.css
+- app/fonts/lib/glyphicons-halflings-regular.eot
+- app/fonts/lib/glyphicons-halflings-regular.svg
+- app/fonts/lib/glyphicons-halflings-regular.ttf
+- app/fonts/lib/glyphicons-halflings-regular.woff
 - app/img/blank.png
 - app/img/icons/accept.png
 - app/img/icons/add.png
@@ -1094,6 +1085,7 @@ files:
 - app/js/controllers.show.js
 - app/js/framework.js
 - app/js/jquery.twoup.js
+- app/js/lib/bootstrap.js
 - app/js/lib/jquery-2.0.3.js
 - app/js/lib/jquery.ba-bbq.js
 - app/js/lib/jquery.browser.js
@@ -1102,11 +1094,8 @@ files:
 - bin/storys
 - lib/storys.rb
 - lib/storys/core_ext/pathname.rb
+- lib/storys/package.rb
 - lib/storys/story.rb
-- lib/storys/storys.rb
-- lib/storys/storys_package.rb
-- lib/storys/template_helper.rb
-- lib/storys/templates/show.html.haml
 - lib/storys/update.rb
 - lib/storys/version.rb
 - storys.gemspec

data/lib/storys/storys.rb

@@ -1,18 +0,0 @@
-class Storys::Storys
-  attr_reader :root_path
-  attr_reader :storys_path
-
-  def pathname_to_url(path, relative_from)
-    URI.escape(path.relative_path_from(relative_from).to_s)
-  end
-
-  def url_to_pathname(url)
-    path = Addressable::URI.unencode_component(url.normalized_path)
-    path.gsub!(/^\//, "") #Make relative, if we allow mounting at a different root URL this will need to remove the root instead of just '/'
-    root_url_path + path
-  end
-
-  def self.gem_path
-    Pathname.new(__FILE__).dirname.parent.parent
-  end
-end

data/lib/storys/storys_package.rb

@@ -1,57 +0,0 @@
-class Storys::Storys
-  def initialize(root_path)
-    raise "root_path must be an instance of Pathname" unless root_path.is_a?(Pathname)
-
-    @root_path = root_path
-    @storys_path = root_path + ".storys/"
-  end
-
-  def update
-    update_app
-    Storys::Update.new(self)
-  end
-
-  def install
-    storys_path.mkdir unless File.exists?(storys_path)
-
-    update_app
-  end
-
-  def update_app
-    dev = ENV["STORYS_ENV"] == "development"
-
-    app_children_paths.each do |file|
-      storys_file = storys_path + file.basename
-      FileUtils.rm_rf(storys_file, :verbose => dev)
-    end
-
-    if dev
-      app_children_paths.each do |file|
-        storys_file = storys_path + file.basename
-        FileUtils.ln_sf(file, storys_file, :verbose => dev)
-      end
-    else
-      FileUtils.cp_r(Storys::Storys.gem_path + "app/.", storys_path, :verbose => dev)
-    end
-
-    FileUtils.chmod_R(0755, storys_path, :verbose => dev)
-  end
-
-  def self.load_json(path)
-    if File.exists?(path)
-      JSON.parse(File.read(path))
-    else
-      nil
-    end
-  end
-
-  def self.save_json(path, data)
-    File.open(path, "w") { |f| f << data.to_json }
-  end
-
-  private
-  def app_children_paths
-    app_path = Storys::Storys.gem_path + "app/"
-    app_path.children.reject { |f| f.basename.to_s == "img"} #TODO: Deal with this directory properly
-  end
-end

data/lib/storys/template_helper.rb

@@ -1,5 +0,0 @@
-module Storys::TemplateHelper
-  def assets_url
-    #what
-  end
-end

data/lib/storys/templates/show.html.haml

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-%html
-  %head
-    %meta{ charset: "utf-8" }
-    %title #{directory.title} - Manga Reader
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
-    %script{ type: "text/javascript", src: (assets_url + "js/lib/jquery-1.4.4.js") }
-    %script{ type: "text/javascript", src: (assets_url + "js/lib/jquery.ba-bbq.js") }
-    %script{ type: "text/javascript", src: (assets_url + "js/show.js") }
-    %link{ rel: "stylesheet", type: "text/css", href: (assets_url + "css/style.css") }
-    %link{ rel: "stylesheet", type: "text/css", href: (assets_url + "css/show.css") }
-    <meta name="HandheldFriendly" content="true" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=no" />
-    :javascript
-      var pages = #{directory.page_urls.to_json};
-  %body
-    %img#image{ src: (assets_url + "img/blank.png") }