pinpress 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf02d81f7239b623f70a4f4e047a765fb6603f2
-  data.tar.gz: 7c79e907be640f042376328614bee97aac71e3fc
+  metadata.gz: c5ad4abe5c4ffac712cbc94f5ab57629d55c7392
+  data.tar.gz: 13b08c63e46a7045d8a2568c133074831da84243
 SHA512:
-  metadata.gz: c14f1e6b344374440bb047e12e5f325da73f86fd7434c9e05c0bbd8b54d2bfa67f2aa82f873107ce224d0281b84712b29d68c4623685feb1a6b8e643a57fcd58
-  data.tar.gz: 3461ad458562a329b1234641d5b567c624367aacc704c7c13774f12aab85dcc930a337b2ed81cd545a213271c15ebfed029c19e035fa935e31c2e58d03d3a854
+  metadata.gz: 14951a1894355244746786152988d68e94f0a3c124ef73ba25e23f7eb2324853613fa9d965293cf1852e12339056e91f9c3d4163d06fcbfdffcbbf53e6f678fd
+  data.tar.gz: 08617ed674306742f5778696a0584cd3deef296f27cb3903404694789a60b02682050e340655506944558e2e38ad32c621bab046a43ea989936e7def6230eb15

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+# gem 'simplecov', require: false
+# gem 'coveralls', require: false
+
 gemspec

data/HISTORY.md

@@ -1,3 +1,14 @@
+# 1.3.1 (2014-05-06)
+
+* Modified last-run to store DateTime, rather than just a Date
+
+# 1.3.0 (2014-05-05)
+
+* Huge refactoring; much cleaner
+* Added HTML encoding to pin desriptions
+* Fixed bugs with application of tags to both `pins` and `tags` command
+* Bumped CLIUtils to version 2.2.3
+
 # 1.2.3 (2014-05-04)
 
 * Fixed a bug where error management failed

data/README.md

@@ -42,7 +42,7 @@ SYNOPSIS
     pinpress [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.2
+    1.3.1
 
 GLOBAL OPTIONS
     --help    - Show this message
@@ -158,7 +158,6 @@ grab:
 
 * `-s`: the start date to use (uses [Chronic](https://github.com/mojombo/chronic "Chronic"), which allows dates like "last Tuesday")
 * `-e`: the end date to use (also uses [Chronic](https://github.com/mojombo/chronic "Chronic"))
-* `-t`: a CSV list of tags (e.g., "tag1,tag2") to examine for association (see [below](#getting-tags-that-have-been-used-with-other-tags)).
 
 ## Getting Tags From a Date Forward
 
@@ -184,15 +183,6 @@ $ pinpress tags -e 2014-01-01
 $ pinpress tags -s 2014-01-01 -e 2014-01-31
 ```
 
-## Getting Tags that Have Been Used With Other Tags
-
-```bash
-$ pinpress tags -t 'tag1,tag2' -s 2014-01-01
-```
-
-...returns all tags that have been used *alongside* `tag1` and `tag2`, starting
-on Jarnuary 1, 2014.
-
 ## Getting Tags Used Since Last Run
 
 ```bash
@@ -397,10 +387,10 @@ pinpress:
   # The default `tags` template to use
   default_tag_template
 
-  # The default tags to be used when getting pins or associated tags
+  # The default tags to be used when running `pinpress pins`
   default_tags: ['tag1', 'tag2']
 
-  # The tags to ignore when executing either `pins` or `tags`
+  # The tags to that are removed from the results when running `pinpress tags`
   ignored_tags: ['bad-tag', 'bad-tag2']
 
   # The default number of results to return

data/Rakefile

@@ -8,11 +8,11 @@ end
 
 spec = eval(File.read('pinpress.gemspec'))
 
-require 'rake/testtask'
-desc 'Run unit tests'
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
+require 'rspec/core/rake_task'
+desc "Run the specs."
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+  t.verbose = false
 end
 
 require 'cucumber'
@@ -53,4 +53,5 @@ task :build do
   FileUtils.mv("./pinpress-#{ version }.gem", "pkg")
 end
 
-task :default => [:yard, :test, :features]
+task :default => [:yard, :spec, :features]
+# task :default => [:spec]

data/bin/pinpress

@@ -33,6 +33,7 @@
 require 'chronic'
 require 'cliutils'
 require 'gli'
+require 'htmlentities'
 require 'pinboard'
 require 'pinpress'
 
@@ -49,15 +50,16 @@ version PinPress::VERSION
 # ======================================================
 # Global Flags and Switches
 # ======================================================
+switch([:v], desc: 'Run pinpress in verbose mode')
 
 # ======================================================
-# Pre, Post, and Error
+# Pre (runs before every command)
 # ======================================================
 pre do |global, command, options, args|
   # Load PinPress configuration module.
   load_configuration(PinPress::CONFIG_FILEPATH)
   file_logger = Logger.new(PinPress::LOG_FILEPATH)
-  file_logger.level = LOG_LEVELS[configuration.pinpress[:log_level] || 'DEBUG']
+  file_logger.level = LOG_LEVELS[configuration.pinpress.log_level || 'DEBUG']
   messenger.attach(LOGFILE: file_logger)
 
   if File.exist?(PinPress::CONFIG_FILEPATH)
@@ -80,10 +82,16 @@ pre do |global, command, options, args|
   true
 end
 
+# ======================================================
+# Post (runs after every command)
+# ======================================================
 post do |global, command, options, args|
 
 end
 
+# ======================================================
+# Error (runs when an exception is raised)
+# ======================================================
 on_error do |exception|
   messenger.error(exception.to_s)
   exit!(1)
@@ -103,6 +111,8 @@ desc 'Install and initialize dependencies'
 command :init do |c|
   c.switch([:s], desc: 'Run init from scratch')
   c.action do |global_options, options, args|
+    PinPress.verbose = global_options[:v]
+
     if options[:s]
       PinPress.init(true)
     else
@@ -124,22 +134,58 @@ command :pins do |c|
   c.flag([:s], desc: 'The start date to pull pins from')
   c.flag([:t], desc: 'The tags to use (e.g., "ruby,pinboard")')
 
+  c.desc 'Gets pins from Pinboard'
+  c.action do |global_options, options, args|
+    PinPress.verbose = global_options[:v]
+
+    # Figure out the template to use based on the passed argument (if any)
+    # and/or the presence of a default template.
+    template = PinPress.init_template(args[0], PinPress::Template::TYPE_PIN)
+
+    # Assuming a valid template is found, transform CLI flags into options for
+    # the Pinboard gem.
+    opts = {}
+    opts.merge!(todt: Chronic.parse(options[:e])) if options[:e]
+    opts.merge!(fromdt: Chronic.parse(options[:s])) if options[:s]
+    opts.merge!(PinPress.merge_common_options(options))
+
+    # Request pin data from Pinboard and output the return data.
+    output = PinPress.pin_yield(template, opts)
+    puts output if output
+
+    # Save the last-run date to the configuration file.
+    configuration.pinpress.last_pins_run = Time.now.utc.iso8601
+    configuration.save
+  end
+
   c.desc 'Gets all pins from the last run date + 1'
   c.command :last do |last|
     last.action do |global_options, options, args|
-      last_run_date = configuration.pinpress[:last_pins_run]
+      PinPress.verbose = global_options[:v]
+
+      last_run_date = configuration.pinpress.last_pins_run
       if last_run_date
-        options[:s] = last_run_date + 1
-        puts PinPress.get_data(PinPress::Template::TEMPLATE_TYPE_PIN, args, options)
+        # Figure out the template to use based on the passed argument (if any)
+        # and/or the presence of a default template.
+        template = PinPress.init_template(args[0], PinPress::Template::TYPE_PIN)
+
+        # Set one option: the start date. Set it to the last-run date + 1.
+        opts = {}
+        opts.merge!(fromdt: last_run_date + 1)
+        opts.merge!(PinPress.merge_common_options(options))
+
+        # Request pin data from Pinboard and output the return data.
+        output = PinPress.pin_yield(template, opts)
+        puts output if output
+
+        # Save the last-run date to the configuration file.
+        configuration.pinpress.last_pins_run = Time.now.utc.iso8601
+        configuration.save
       else
         messenger.warn("`pinpress pins` hasn't been run before.")
       end
     end
   end
-
-  c.action do |global_options, options, args|
-    puts PinPress.get_data(PinPress::Template::TEMPLATE_TYPE_PIN, args, options)
-  end
 end
 
 # ------------------------------------------------------
@@ -156,32 +202,68 @@ command :tags do |c|
   c.desc 'Gets all tags from the last run date + 1'
   c.command :last do |last|
     last.action do |global_options, options, args|
-      last_run_date = configuration.pinpress[:last_tags_run]
+      last_run_date = configuration.pinpress.last_tags_run
       if last_run_date
-        options[:s] = last_run_date + 1
-        puts PinPress.get_data(PinPress::Template::TEMPLATE_TYPE_TAG, args, options)
+        PinPress.verbose = global_options[:v]
+
+        # Figure out the template to use based on the passed argument (if any)
+        # and/or the presence of a default template.
+        template = PinPress.init_template(args[0], PinPress::Template::TYPE_TAG)
+
+        # Set one option: the start date. Set it to the last-run date + 1.
+        opts = {}
+        opts.merge!(fromdt: last_run_date + 1)
+        opts.merge!(PinPress.merge_common_options(options))
+
+        # Request tag data from Pinboard and output the return data.
+        output = PinPress.tag_yield(template, opts)
+        puts output if output
+
+        # Save the last-run date to the configuration file.
+        configuration.pinpress.last_tags_run = Time.now.utc.iso8601
+        configuration.save
       else
         messenger.warn("`pinpress tags` hasn't been run before.")
       end
     end
   end
 
-  c.desc 'Gets the unique tags based on the passed criteria'
+  c.desc 'Gets unique tags based on the passed criteria'
   c.action do |global_options, options, args|
-    puts PinPress.get_data(PinPress::Template::TEMPLATE_TYPE_TAG, args, options)
+    PinPress.verbose = global_options[:v]
+
+    # Figure out the template to use based on the passed argument (if any)
+    # and/or the presence of a default template.
+    template = PinPress.init_template(args[0], PinPress::Template::TYPE_TAG)
+
+    # Assuming a valid template is found, transform CLI flags into options for
+    # the Pinboard gem.
+    opts = {}
+    opts.merge!(todt: Chronic.parse(options[:e])) if options[:e]
+    opts.merge!(fromdt: Chronic.parse(options[:s])) if options[:s]
+    opts.merge!(PinPress.merge_common_options(options))
+
+    # Request tag data from Pinboard and output the return data.
+    output = PinPress.tag_yield(template, opts)
+    puts output if output
+
+    # Save the last-run date to the configuration file.
+    configuration.pinpress.last_tags_run = Time.now.utc.iso8601
+    configuration.save
   end
 end
 
 # ------------------------------------------------------
 # templates command
 #
-# Manages pin templates.
+# Manages pin and tag templates.
 # ------------------------------------------------------
 desc 'Work with templates for pin output'
 command :templates do |c|
   c.desc 'List current templates'
   c.command :list do |list|
     list.action do |global_options, options, args|
+      PinPress.verbose = global_options[:v]
       PinPress.list_templates
     end
   end

data/features/support/env.rb

@@ -1,4 +1,5 @@
 require 'aruba/cucumber'
+# require 'simplecov'
 require_relative '../../lib/pinpress/constants'
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"

data/lib/pinpress.rb

@@ -1,11 +1,11 @@
 require 'pinpress/constants'
-require 'pinpress/templates/template'
-require 'pinpress/templates/pin_template'
-require 'pinpress/templates/tag_template'
+require 'pinpress/template'
 
 # The PinPress module, which wraps everything
 # in this gem.
 module PinPress
+  extend self
+
   class << self
     # Stores whether initalization has completed.
     # @return [Boolean]
@@ -16,137 +16,63 @@ module PinPress
     attr_accessor :verbose
   end
 
-  # Establishes the template to use and yields a block with that
-  # template an a Pinboard client.
-  # @param [Fixnum] template_type Either a Pin or Tag template
-  # @param [String] template_name The neame of the template to use
-  # @yield
-  # @return [void]
-  def self.execute_template(template_type, template_name)
-    template_hash = PinPress.get_template_by_name(template_type, template_name)
-    if template_hash
-      template = PinPress::TagTemplate.new(template_hash)
-      client = Pinboard::Client.new(token: configuration.pinpress[:api_token])
-      yield template, client
-    else
-      fail 'Invalid template provided and/or no default template'
-    end
-  end
-
-  # Generates a string of items from pins.
-  # @param [Fixnum] template_type
-  # @param [PinPress::Template] template
-  # @param [Array] pins
-  # @return [String]
-  def self.generate_items(template_type, template, pins, opts)
-    output = ''
-    case template_type
-    when PinPress::Template::TEMPLATE_TYPE_PIN
-      pins.each do |p|
-        href        = p[:href]
-        description = p[:description]
-        extended    = p[:extended]
-        tag         = p[:tag]
-        time        = p[:time]
-        replace     = p[:replace]
-        shared      = p[:shared]
-        toread      = p[:toread]
-        output += ERB.new(template.item).result(binding)
-      end
-      configuration.pinpress[:last_pins_run] = Date.today
-    when PinPress::Template::TEMPLATE_TYPE_TAG
-      tags = []
-      pins.each { |p| tags += p[:tag] }
-      tags = tags.uniq.map { |t| { tag: t, count: tags.count(t) } }
-      tags.each do |t|
-        unless t[:tag] == opts[:tag]
-          tag   = t[:tag]
-          count = t[:count]
-          output += ERB.new(template.item).result(binding)
-        end
-      end
-      configuration.pinpress[:last_tags_run] = Date.today
-    end
-    output
-  end
-
-  # Generic function to get data from Pinboard.
-  # @param [Fixnum] template_type
-  # @param [Array] args
-  # @param [Hash] options
-  # @return [String]
-  def self.get_data(template_type, args, options)
-    output = ''
-
-    # Two scenarios covered here:
-    #   1. If the user passes a valid name, grab that template.
-    #   2. If no name is passed, grabbed the default template
-    # If both of these conditions fail, an error message is shown.
-    # t_type = PinPress::Template::TEMPLATE_TYPE_PIN
-    # t_name = args.empty? ? nil : args[0]
-    t_name = args.empty? ? nil : args[0]
-
-    PinPress.execute_template(template_type, t_name) do |template, client|
-      opts = {}
-      opts.merge!(todt: Chronic.parse(options[:e])) if options[:e]
-      opts.merge!(fromdt: Chronic.parse(options[:s])) if options[:s]
-
-      if options[:n]
-        opts.merge!(results: options[:n])
-      elsif configuration.pinpress[:default_num_results]
-        opts.merge!(results: configuration.pinpress[:default_num_results])
-      end
-
-      if options[:t]
-        tags = options[:t].split(',')
-      elsif configuration.pinpress[:default_tags]
-        tags = configuration.pinpress[:default_tags]
-      end
-
-      ignored_tags = configuration.pinpress[:ignored_tags]
-      tags -= ignored_tags if ignored_tags
-      opts.merge!(tag: tags) if tags
-
-      begin
-        pins = client.posts(opts)
-        if pins.empty?
-          messenger.warn('No matching pins...')
-        else
-          output += template.opener if template.opener
-          output += PinPress.generate_items(template_type, template, pins, opts)
-          output += template.closer if template.closer
-        end
-
-        configuration.save
-        return output
-      rescue StandardError => e
-        messenger.debug(e.to_s)
-        raise "Pinboard API failed; are you sure you've run " \
-             " `pinpress init` (and that your API key is correct)?"
+  # Grabs Pinboard data (passed on passed options) and yields a block that
+  # allows the user to act upon that returned data.
+  # @param [Hash] pinboard_opts
+  # @yield pins
+  # @raise StandardError if Pinboard client fails
+  def execute_template(pinboard_opts)
+    begin
+      client = Pinboard::Client.new(token: configuration.pinpress.api_token)
+      pins = client.posts(pinboard_opts)
+      if pins.empty?
+        messenger.warn('No data matching your arguments...')
+      else
+        yield pins
       end
+    rescue StandardError => e
+      messenger.debug(e.to_s)
+      puts e.to_s
+      raise "Pinboard API failed; are you sure you've run " \
+           " `pinpress init` (and that your API key is correct)?"
     end
   end
 
-  # Determines whether a template exists.
-  # @param [Fixnum] template_type
-  # @param [<String, Symbol>] template_name
-  # @return [Template]
-  def self.get_template_by_name(template_type, template_name = nil)
+  # Returns a template Hash from the configuration file.
+  # @param [String] template_name The name of the template to get
+  # @param [Fixnum] template_type The template type
+  # @return [Hash]
+  def get_template(template_name, template_type)
     case template_type
-    when Template::TEMPLATE_TYPE_PIN
-      default_t_name = configuration.pinpress[:default_pin_template]
+    when PinPress::Template::TYPE_PIN
       templates = configuration.pin_templates
-    when Template::TEMPLATE_TYPE_TAG
-      default_t_name = configuration.pinpress[:default_tag_template]
+    when PinPress::Template::TYPE_TAG
       templates = configuration.tag_templates
-    else
-      fail 'Invalid template type given'
     end
+    templates.find { |t| t[:name] == template_name }
+  end
 
-    if template_name.nil?
-      return templates.find { |t| t[:name] == default_t_name }
+  # "Initializes" a passed template:
+  #    1. If the template exists, returns it.
+  #    2. If not, return a default template (if it exists).
+  #    3. Throw an exception if #1 and #2 fail.
+  # @param [String] explicit_template A template name passed in via the CLI
+  # @param [Fixnum] template_type The template type
+  # @return [Hash]
+  # @raise StandardError if no explicit or default template is found
+  def init_template(explicit_template, template_type)
+    pin_t_sym = :default_pin_template
+    tag_t_sym = :default_tag_template
+    s = (template_type == PinPress::Template::TYPE_PIN ? pin_t_sym : tag_t_sym)
+    default_template = configuration.pinpress[s]
+    if PinPress.is_template?(explicit_template, template_type)
+      messenger.debug("Using explicit template: #{ explicit_template }")
+      return PinPress.get_template(explicit_template, template_type)
+    elsif PinPress.is_template?(default_template, template_type)
+      messenger.debug("Using default template: #{ default_template }")
+      return PinPress.get_template(default_template, template_type)
     else
-      return templates.find { |t| t[:name] == template_name }
+      fail 'Invalid template defined and/or no default template specified'
     end
   end
 
@@ -154,51 +80,64 @@ module PinPress
   # collecting all necessary items and info.
   # @param [Boolean] from_scratch
   # @return [void]
-  def self.init(from_scratch = false)
+  def init(from_scratch = false)
     messenger.section('INITIALIZING...')
     if from_scratch
       configuration.reset
-      configuration.add_section(:pinpress)
-      configuration.add_section(:pin_templates)
-      configuration.add_section(:tag_templates)
 
-      configuration.pinpress.merge!(
+      # Add initial configuration info.
+      configuration.add_section(:pinpress)
+      configuration.pinpress = {
         config_location: configuration.config_path,
         default_pin_template: 'pinpress_default',
         default_tag_template: 'pinpress_default',
         log_level: 'WARN',
         version: PinPress::VERSION
-      )
+      }
 
+      # Add a single default pin and tag template
       default_pin_template = {
         name: 'pinpress_default',
         opener: '<ul>',
-        item: '<li><b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b> <%= extended %></li>',
+        item: '<li><%= href %></li>',
         closer: '</ul>'
       }
-
       default_tag_template = {
         name: 'pinpress_default',
         item: '<%= tag %> (<%= count %>),'
       }
-
-      configuration.data['pin_templates'] = [default_pin_template]
-      configuration.data['tag_templates'] = [default_tag_template]
+      configuration.pin_templates = [default_pin_template]
+      configuration.tag_templates = [default_tag_template]
     end
 
+    # Run through installation prompts and ingest the results into
+    # the configuration.
     pm = CLIUtils::Prefs.new(PinPress::PREF_FILES['INIT'], configuration)
     pm.ask
     configuration.ingest_prefs(pm)
 
-    messenger.debug("Configuration values after pref collection: #{ configuration.data }")
-
+    m = "Configuration values after pref collection: #{ configuration.data }"
+    messenger.debug(m)
     configuration.save
     @initialized = true
   end
 
+  # Determines whether a template exists in the configuration file.
+  # @param [String] template_name The name of the template to search for
+  # @param [Fixnum] template_type The template type
+  def is_template?(template_name, template_type)
+    case template_type
+    when PinPress::Template::TYPE_PIN
+      templates = configuration.pin_templates
+    when PinPress::Template::TYPE_TAG
+      templates = configuration.tag_templates
+    end
+    !templates.find { |t| t[:name] == template_name }.nil?
+  end
+
   # Present a list of installed templates to the user
   # @return [void]
-  def self.list_templates
+  def list_templates
     pin_templates = configuration.pin_templates
     tag_templates = configuration.tag_templates
 
@@ -221,10 +160,84 @@ module PinPress
     end
   end
 
+  # Helper method to merge command line options that are relevant for both pin
+  # and tag requests.
+  # @param [Hash] options
+  # @return [Hash]
+  def merge_common_options(options)
+    opts = {}
+    if options[:n]
+      opts.merge!(results: options[:n])
+    elsif configuration.pinpress.default_num_results
+      opts.merge!(results: configuration.pinpress.default_num_results)
+    end
+
+    if options[:t]
+      opts.merge!(tag: options[:t])
+    elsif configuration.pinpress.default_tags
+      opts.merge!(tag: configuration.pinpress.default_tags.join(','))
+    end
+    opts
+  end
+
+  # Creates text output from pin data (based upon a passed template).
+  # @param [Hash] template The template to use
+  # @param [Hash] opts CLI options to use
+  # @return [String]
+  def pin_yield(template, opts)
+    output = ''
+    PinPress.execute_template(opts) do |data|
+      html_coder = HTMLEntities.new
+
+      output += template[:opener] if template[:opener]
+      data.each do |i|
+        href        = i[:href]
+        description = html_coder.encode(i[:description])
+        extended    = i[:extended]
+        tag         = i[:tag]
+        time        = i[:time]
+        replace     = i[:replace]
+        shared      = i[:shared]
+        toread      = i[:toread]
+        output += ERB.new(template[:item]).result(binding)
+      end
+      output += template[:closer] if template[:closer]
+    end
+    output
+  end
+
+  # Creates text output from tag data (based upon a passed template).
+  # @param [Hash] template The template to use
+  # @param [Hash] opts CLI options to use
+  # @return [String]
+  def tag_yield(template, opts)
+    output = ''
+    PinPress.execute_template(opts) do |data|
+      tags = []
+      ignored_tags = configuration.pinpress.ignored_tags
+
+      data.each { |i| tags += i[:tag] }
+      tags = (tags -= ignored_tags if ignored_tags).uniq.map do |t|
+        { tag: t, count: tags.count(t) }
+      end
+
+      output += template[:opener] if template[:opener]
+      tags.each do |t|
+        unless t[:tag] == opts[:tag]
+          tag   = t[:tag]
+          count = t[:count]
+          output += ERB.new(template.item).result(binding)
+        end
+      end
+      output += template[:closer] if template[:closer]
+    end
+    output
+  end
+
   # Notifies the user that the config file needs to be
   # re-done and does it.
   # @return [void]
-  def self.update_config_file
+  def update_config_file
     m = "This version needs to make some config changes. Don't worry; " \
         "when prompted, your current values for existing config options " \
         "will be presented (so it'll be easier to fly through the upgrade)."

data/lib/pinpress/constants.rb

@@ -9,7 +9,7 @@ module PinPress
 
   # The Gem's description
   DESCRIPTION = %q(A Pinboard application that allows for the creation of
-                   pin and tag templates in almost any conceivable format.)
+                  pin and tag templates in almost any conceivable format.)
 
   # The last version to require a config update
   NEWEST_CONFIG_VERSION = '1.2.1'
@@ -28,5 +28,5 @@ module PinPress
   SUMMARY = 'A simple CLI to create HTML templates of Pinboard data.'
 
   # The Gem's version
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

data/lib/pinpress/template.rb

@@ -0,0 +1,12 @@
+module PinPress
+  # A template for outputting Pinboard data
+  class Template
+    # Defines a pin template
+    # @return [Fixnum]
+    TYPE_PIN = 1
+
+    # Defines a tag template
+    # @return [Fixnum]
+    TYPE_TAG = 2
+  end
+end

data/pinpress.gemspec

@@ -16,10 +16,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency('aruba', '0.5.4')
   spec.add_development_dependency('rake', '10.1.1')
-  spec.add_development_dependency('rdoc', '4.1.1')
+  spec.add_development_dependency('rspec', '2.14.1')
   spec.add_development_dependency('yard', '0.8.7.4')
   spec.add_runtime_dependency('chronic', '0.10.2')
   spec.add_runtime_dependency('cliutils', '~> 2')
   spec.add_runtime_dependency('gli', '2.9.0')
+  spec.add_runtime_dependency('htmlentities', '4.3.1')
   spec.add_runtime_dependency('pinboard', '0.1.1')
 end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+# require 'coveralls'
+require 'rspec'
+# require 'simplecov'
+require 'stringio'
+
+# SimpleCov.start
+# Coveralls.wear!
+
+def capture_stdout
+  old = $stdout
+  $stdout = fake = StringIO.new
+  yield
+  fake.string
+ensure
+  $stdout = old
+end

data/support/sample_config.yaml

@@ -8,7 +8,7 @@ pinpress:
 pin_templates:
 - name: pinpress_default
   opener: "<ul>"
-  item: <li><b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b> <%= extended %></li>
+  item: <li><%= href %></li>
   closer: "</ul>"
 tag_templates:
 - name: pinpress_default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinpress
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: pinboard
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +138,7 @@ dependencies:
         version: 0.1.1
 description: |-
   A Pinboard application that allows for the creation of
-                     pin and tag templates in almost any conceivable format.
+                    pin and tag templates in almost any conceivable format.
 email:
 - bachya1208@googlemail.com
 executables:
@@ -147,16 +161,11 @@ files:
 - features/support/env.rb
 - lib/pinpress.rb
 - lib/pinpress/constants.rb
-- lib/pinpress/templates/pin_template.rb
-- lib/pinpress/templates/tag_template.rb
-- lib/pinpress/templates/template.rb
+- lib/pinpress/template.rb
 - pinpress.gemspec
+- spec/spec_helper.rb
 - support/preference_prompts.yaml
 - support/sample_config.yaml
-- test/pin_template_test.rb
-- test/pinpress_template_test.rb
-- test/tag_template_test.rb
-- test/test_helper.rb
 homepage: https://github.com/bachya/pinpress
 licenses:
 - MIT
@@ -187,8 +196,5 @@ test_files:
 - features/3.templates.feature
 - features/step_definitions/pinpress_steps.rb
 - features/support/env.rb
-- test/pin_template_test.rb
-- test/pinpress_template_test.rb
-- test/tag_template_test.rb
-- test/test_helper.rb
+- spec/spec_helper.rb
 has_rdoc: 

data/lib/pinpress/templates/pin_template.rb

@@ -1,13 +0,0 @@
-module PinPress
-  # A template for a pin; even though
-  # currently empty, allows for future
-  # flexibility.
-  class PinTemplate < Template
-    # Initializes a new Pin Template.
-    # @param [Hash] params
-    # @return [void]
-    def initialize(params = {})
-      super(params)
-    end
-  end
-end

data/lib/pinpress/templates/tag_template.rb

@@ -1,13 +0,0 @@
-module PinPress
-  # A template for a tag; even though
-  # currently empty, allows for future
-  # flexibility.
-  class TagTemplate < Template
-    # Initializes a new Tag Template.
-    # @param [Hash] params
-    # @return [void]
-    def initialize(params = {})
-      super(params)
-    end
-  end
-end

data/lib/pinpress/templates/template.rb

@@ -1,41 +0,0 @@
-module PinPress
-  # A template for outputting Pinboard data
-  class Template
-    # Defines a pin template
-    # @return [Fixnum]
-    TEMPLATE_TYPE_PIN = 1
-
-    # Defines a tag template
-    # @return [Fixnum]
-    TEMPLATE_TYPE_TAG = 2
-
-    # Holds the "closer" (the string that
-    # should come after all template items
-    # are output)
-    # @return [String]
-    attr_accessor :closer
-
-    # Holds the string that defines what
-    # an item should look like.
-    # @return [String]
-    attr_accessor :item
-
-    # Holds the name of the template.
-    # @return [String]
-    attr_accessor :name
-
-    # Holds the "opener" (the string that
-    # should come before all template items
-    # are output)
-    # @return [String]
-    attr_accessor :opener
-
-    # Initializes this class by ingesting
-    # passed parameters.
-    # @param [Hash] params
-    # @return [void]
-    def initialize(params = {})
-      params.each { |key, value| send("#{ key }=", value) }
-    end
-  end
-end

data/test/pin_template_test.rb

@@ -1,21 +0,0 @@
-require 'test_helper'
-
-require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/template')
-require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/pin_template')
-
-class TestPinTemplate < Test::Unit::TestCase
-  def test_initialization
-    parameters = {
-      closer: '</ul>',
-      item: '<li></li>',
-      name: 'default',
-      opener: '</ul>',
-    }
-
-    t = PinPress::PinTemplate.new(parameters)
-    assert_equal(t.closer, parameters[:closer])
-    assert_equal(t.item, parameters[:item])
-    assert_equal(t.name, parameters[:name])
-    assert_equal(t.opener, parameters[:opener])
-  end
-end

data/test/pinpress_template_test.rb

@@ -1,20 +0,0 @@
-require 'test_helper'
-
-require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/template')
-
-class TestPinPressTemplate < Test::Unit::TestCase
-  def test_initialization
-    parameters = {
-      closer: '</ul>',
-      item: '<li></li>',
-      name: 'default',
-      opener: '</ul>',
-    }
-
-    t = PinPress::Template.new(parameters)
-    assert_equal(t.closer, parameters[:closer])
-    assert_equal(t.item, parameters[:item])
-    assert_equal(t.name, parameters[:name])
-    assert_equal(t.opener, parameters[:opener])
-  end
-end

data/test/tag_template_test.rb

@@ -1,21 +0,0 @@
-require 'test_helper'
-
-require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/template')
-require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/tag_template')
-
-class TestTagTemplate < Test::Unit::TestCase
-  def test_initialization
-    parameters = {
-      closer: '</ul>',
-      item: '<li></li>',
-      name: 'default',
-      opener: '</ul>',
-    }
-
-    t = PinPress::TagTemplate.new(parameters)
-    assert_equal(t.closer, parameters[:closer])
-    assert_equal(t.item, parameters[:item])
-    assert_equal(t.name, parameters[:name])
-    assert_equal(t.opener, parameters[:opener])
-  end
-end

data/test/test_helper.rb

@@ -1,5 +0,0 @@
-require 'test/unit'
-
-class Test::Unit::TestCase
-
-end